Merge remote-tracking branch 'origin/main' into GUI

.conda/build_variants.yaml

@@ -0,0 +1,16 @@
+# These "# [...]" comments are functional. 
+# They enable the line when the thing in [...] is a valid python expression that 
+# evaluates to True. linux and osx are variables provided to us and set to True if 
+# we are running conda-build on a Linux OS or MacOS, respectively.
+c_compiler:
+  - gcc   # [linux]
+  - clang # [osx]
+cxx_compiler:
+  - gxx     # [linux]
+  - clangxx # [osx]
+target_platform:
+  - linux-64      # [linux]
+  - linux-aarch64 # [linux] 
+  - linux-ppc64le # [linux]
+  - osx-64        # [osx]
+  - osx-arm64     # [osx]

Anaconda-Packages/add-compiler-flags.sh → .conda/cross-compile-setup.sh

@@ -1,9 +1,6 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE="${SCRIPT_DIR}/cross-linux.cmake")
 source "${SCRIPT_DIR}/patch_conda_cxxflags.sh"
-
 # Make sure the MPI wrappers find the right compilers
-export OMPI_CC=$GCC
-export OMPI_CXX=$GXX
-export OMPI_FC=$F90
+export OMPI_CC=$CC
+export OMPI_CXX=$CXX
+export OMPI_FC=$FC

Anaconda-Packages/elements/recipe/build.sh → .conda/elements/build.sh

@@ -9,7 +9,7 @@ if [ $(uname) == Linux ]; then
     export MPI_FLAGS="$MPI_FLAGS;-mca;plm;isolated"
 fi
 
-source "$RECIPE_DIR/../../add-compiler-flags.sh"
+source "$RECIPE_DIR/../cross-compile-setup.sh"
 
 cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \

Anaconda-Packages/elements/recipe/meta.yaml → .conda/elements/meta.yaml

@@ -1,5 +1,6 @@
 {% set version = "1.0.0" %}
-{% set compiler_version = "10.4.0" %}
+{% set linux_compiler_version = "10.4.0" %}
+{% set macos_compiler_version = "12" %}
 
 package:
   name: elements
@@ -13,13 +14,13 @@ build:
   number: 1
   noarch: False
   script_env:
-    - PLATFORM={{ target_platform }}
+    - PLATFORM={{ target_platform }} # [linux]
 
 requirements:
   build:
     - cmake >=3.10.0
-    - {{ compiler('c') }} ={{ compiler_version }}
-    - {{ compiler('cxx') }} ={{ compiler_version }}
+    - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
 
 about:
   home: https://github.com/lanl/Fierro
@@ -37,4 +38,4 @@ about:
 
 extra:
   recipe-maintainers:
-    - kwelsh-lanl
+    - fierromechanics

.conda/empty.yaml

@@ -0,0 +1,3 @@
+# This file exists for the build-conda-package github action.
+empty:
+  - 0

.conda/evpfft-dev/cpu/meta.yaml

@@ -0,0 +1,37 @@
+{% set version = "1.0.0" %}
+{% set linux_compiler_version = "10.4.0" %}
+{% set macos_compiler_version = "12" %}
+
+package:
+  name: evpfft-dev
+  version: {{ version }}
+
+build:
+  number: 1
+  noarch: generic
+  skip: True # [not (linux and x86_64)]
+  script_env:
+    - PLATFORM={{ target_platform }}
+
+requirements:
+  run:
+    - {{ compiler('c') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('c') }}={{ macos_compiler_version }} # [osx]
+    - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
+    - openmpi
+    - fierro-heffte
+    - fftw=*=mpi_openmpi_*
+    - kokkos=4.1
+    - hdf5=*=mpi_openmpi_*
+    - elements
+
+about:
+  home: https://github.com/lanl/Fierro
+  summary: This is a metapackage for EVPFFT developers. Installing this package gives you all the dependencies necessary to build EVPFFT from source.
+  description:
+  dev_url: https://github.com/lanl/Fierro
+
+extra:
+  recipe-maintainers:
+    - fierromechanics

.conda/evpfft-gui/meta.yaml

@@ -0,0 +1,36 @@
+package: 
+  name: evpfft_gui
+  version: 2
+
+source:
+  path: ../../
+  # - git_url: https://github.com/lanl/Fierro.git
+  #   depth: 1
+
+build:
+  number: 0
+  script: cd python/EVPFFT-GUI/; pip install .
+  noarch: python # This is a pure python package. So build for noarch on linux64
+  entry_points:
+    - evpfft-gui = evpfft_gui.gui:main
+  skip: true  # [not (linux and x86_64)]
+  skip: false # [linux and x86_64]
+
+requirements:
+  host:
+    - python
+    - setuptools
+  run:
+    - paraview=5.11.2
+    - evpfft
+    - fierro-voxelizer
+    - python
+    - pyside6=6.5
+
+test:
+  imports:
+    - evpfft_gui
+
+extra:
+  recipe-maintainers:
+    - fierromechanics

Anaconda-Packages/evpfft/cpu/build.sh → .conda/evpfft/cpu/build.sh

@@ -1,5 +1,5 @@
 # Patch the cxx variables for cross-compilation
-source "$RECIPE_DIR/../../add-compiler-flags.sh"
+source "$RECIPE_DIR/../../cross-compile-setup.sh"
 
 cd src/EVPFFT
 mkdir build

Anaconda-Packages/evpfft/cpu/meta.yaml → .conda/evpfft/cpu/meta.yaml

@@ -1,8 +1,9 @@
 {% set version = "1.0.0" %}
-{% set compiler_version = "10.4.0" %}
+{% set linux_compiler_version = "10.4.0" %}
+{% set macos_compiler_version = "12" %}
 
 package:
-  name: fierro-evpfft
+  name: evpfft
   version: {{ version }}
 
 source:
@@ -17,21 +18,23 @@ build:
 requirements:
   build:
     - cmake >=3.17.0
-    - {{ compiler('c') }} ={{ compiler_version }}
-    - {{ compiler('cxx') }} ={{ compiler_version }}
+    - {{ compiler('c') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('c') }}={{ macos_compiler_version }} # [osx]
+    - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - openmpi
   host:
     - openmpi
     - fierro-heffte
     - fftw=*=mpi_openmpi_*
-    - kokkos
+    - kokkos=4.1
     - hdf5=*=mpi_openmpi_*
     - elements
   run:
     - openmpi
     - fierro-heffte
     - fftw=*=mpi_openmpi_*
-    - kokkos
+    - kokkos=4.1
     - hdf5=*=mpi_openmpi_*
     - elements
 
@@ -48,4 +51,4 @@ about:
 
 extra:
   recipe-maintainers:
-    - kwelsh-lanl
+    - fierromechanics

Anaconda-Packages/evpfft/cuda/build.sh → .conda/evpfft/cuda/build.sh

@@ -6,7 +6,7 @@
 ####
 
 # Patch the cxx variables for cross-compilation
-source "$RECIPE_DIR/../../add-compiler-flags.sh"
+source "$RECIPE_DIR/../../cross-compile-setup.sh"
 
 # MPICXX -> nvcc_wrapper -> nvcc -> $GXX
 #           ^ Passes $NVCC_WRAPPER_DEFAULT_COMPILER as the host compiler to nvcc

Anaconda-Packages/evpfft/cuda/meta.yaml → .conda/evpfft/cuda/meta.yaml

@@ -1,8 +1,9 @@
 {% set version = "1.0.0" %}
-{% set compiler_version = "10.4.0" %}
+{% set linux_compiler_version = "10.4.0" %}
+{% set macos_compiler_version = "12" %}
 
 package:
-  name: fierro-evpfft-cuda
+  name: evpfft-cuda
   version: {{ version }}
 
 source:
@@ -17,8 +18,8 @@ build:
 requirements:
   build:
     - cmake >=3.17.0
-    - {{ compiler('c') }} ={{ compiler_version }}
-    - {{ compiler('cxx') }} ={{ compiler_version }}
+    - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - cuda-compiler
     - openmpi
   host:
@@ -28,7 +29,6 @@ requirements:
     - hdf5=*=mpi_openmpi_h457a7a6_3
     - fierro-trilinos-cuda # Statically linked against Kokkos CUDA kernels from here.
     - elements
-
   run:
     - openmpi
     - fierro-heffte-cuda
@@ -46,4 +46,4 @@ about:
 
 extra:
   recipe-maintainers:
-    - kwelsh-lanl
+    - fierromechanics

.conda/fierro-dev/cpu/meta.yaml

@@ -0,0 +1,33 @@
+{% set version = "1.0.0" %}
+{% set compiler_version = "10.4.0" %}
+
+package:
+  name: fierro-dev
+  version: {{ version }}
+
+build:
+  number: 1
+  noarch: generic
+  skip: True # [not (linux and x86_64)]
+  script_env:
+    - PLATFORM={{ target_platform }}
+
+requirements:
+  run:
+    - cmake >=3.17
+    - {{ compiler('cxx') }}={{ compiler_version }}
+    - fierro-trilinos-cpu
+    - mpi
+    - elements
+
+about:
+  home: https://github.com/lanl/Fierro
+  license: BSD-3-Clause
+  license_family: BSD
+  summary:
+    Metapackage for consolidating development dependencies for fierro.
+  dev_url: https://github.com/lanl/Fierro
+
+extra:
+  recipe-maintainers:
+    - fierromechanics

Anaconda-Packages/fierro/cpu/build.sh → .conda/fierro/cpu/build.sh

@@ -1,26 +1,22 @@
-export SRC_DIR=$(pwd)
-mkdir -p build
+# These flag variables are set by anaconda.
+source "$RECIPE_DIR/../../cross-compile-setup.sh"
+mkdir build
 cd build
 
-export MPI_FLAGS="--allow-run-as-root"
-
-if [ $(uname) == Linux ]; then
-    export MPI_FLAGS="$MPI_FLAGS;-mca;plm;isolated"
-fi
-
-# These flag variables are set by anaconda.
-source "$RECIPE_DIR/../../add-compiler-flags.sh"
+# -D _LIBCPP_DISABLE_AVAILABILITY
+# is added to the CXXFLAGS for MacOS builds. 
+# see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
 
-cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
+cmake .. \
+      -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
       -D CMAKE_CXX_STANDARD:STRING=17 \
       -D BUILD_PARALLEL_EXPLICIT_SOLVER=ON \
       -D BUILD_IMPLICIT_SOLVER=ON \
       -D BUILD_ELEMENTS=OFF \
-      -D DISTRIBUTION=True \
+      -D DISTRIBUTION=On \
       $CMAKE_ARGS \
-      $SRC_DIR \
-      -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS -fopenmp" \
+      -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS -fopenmp -D_LIBCPP_DISABLE_AVAILABILITY" \
       -D MPI_C_COMPILER="$BUILD_PREFIX/bin/mpicc" \
       -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \
       -D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \

Anaconda-Packages/fierro/cpu/meta.yaml → .conda/fierro/cpu/meta.yaml

@@ -1,5 +1,9 @@
 {% set version = "1.0.0" %}
-{% set compiler_version = "10.4.0" %}
+{% set linux_compiler_version = "10.4.0" %}
+{% set macos_compiler_version = "12" %}
+# We need the same MPI version in build + host. 
+# So we have to specify it, unfortunately
+{% set mpi_version = "4.1" %}
 
 package:
   name: fierro-cpu
@@ -10,27 +14,28 @@ source:
   git_depth: 1
 
 build:
-  number: 1
+  number: 2
   script_env:
     - PLATFORM={{ target_platform }}
 
 requirements:
   build:
     - cmake >=3.17.0
-    - {{ compiler('c') }} ={{ compiler_version }}
-    - {{ compiler('cxx') }} ={{ compiler_version }}
-    - openmpi
+    - {{ compiler('c') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('c') }}={{ macos_compiler_version }} # [osx]
+    - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
+    - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
+    - openmpi={{ mpi_version }}
   host:
-    - _openmp_mutex
-    - openmpi
+    - _openmp_mutex # [linux]
+    - llvm-openmp   # [osx]
+    - openmpi={{ mpi_version }}
     - fierro-trilinos-cpu
     - elements
   run:
     - fierro-trilinos-cpu
     - mpi
 
-#TODO: Add tests
-
 about:
   home: https://github.com/lanl/Fierro
   license: BSD-3-Clause
@@ -47,4 +52,4 @@ about:
 
 extra:
   recipe-maintainers:
-    - kwelsh-lanl
+    - fierromechanics

Anaconda-Packages/heffte/cpu/build.sh → .conda/heffte/cpu/build.sh

@@ -9,10 +9,11 @@ if [ $(uname) == Linux ]; then
     export MPI_FLAGS="$MPI_FLAGS;-mca;plm;isolated"
 fi
 
-source "$RECIPE_DIR/../../add-compiler-flags.sh"
+source "$RECIPE_DIR/../../cross-compile-setup.sh"
 
+# I don't know why, but I couldn't compile for osx-arm64 from osx-64 with shared libs.
 cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
-      -D BUILD_SHARED_LIBS=ON \
+      -D BUILD_SHARED_LIBS=OFF \
       -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
       -D CMAKE_CXX_STANDARD:STRING=17 \
       -D Heffte_ENABLE_FFTW=ON \