Merge pull request #210 from lanl/anaconda

Anaconda

.conda/elements/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: elements

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

@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: evpfft-dev

.conda/evpfft/cpu/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: evpfft

.conda/evpfft/cuda/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: evpfft-cuda

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

@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: fierro-dev

.conda/fierro/cpu/meta.yaml

@@ -1,9 +1,10 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 # We need the same MPI version in build + host. 
 # So we have to specify it, unfortunately
-{% set mpi_version = "4.1" %}
+# UPDATE: Not necessary right now, perhaps in the future
+#{% set mpi_version = "4.1" %}
 
 package:
   name: fierro-cpu
@@ -26,16 +27,16 @@ requirements:
     - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('fortran') }}
-    - openmpi={{ mpi_version }}
+    - openmpi
   host:
     - _openmp_mutex # [linux]
     - llvm-openmp   # [osx]
-    - openmpi={{ mpi_version }}
     - fierro-trilinos-cpu
     - elements
+    - openmpi
   run:
     - fierro-trilinos-cpu
-    - mpi
+    - openmpi
 
 about:
   home: https://github.com/lanl/Fierro

.conda/heffte/cpu/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: fierro-heffte

.conda/heffte/cuda/build.sh

@@ -7,20 +7,22 @@ export MPI_FLAGS="--allow-run-as-root"
 
 if [ $(uname) == Linux ]; then
     export MPI_FLAGS="$MPI_FLAGS;-mca;plm;isolated"
+#    export CUDACXX=$(which nvcc)
 fi
 
 source "$RECIPE_DIR/../../cross-compile-setup.sh"
 
 export OMPI_CXX=nvcc
 # Only do this for cross compiling
-if [ "$PLATFORM" != "linux-64" ] ; then
-    export NVCC_PREPEND_FLAGS="-ccbin $CXX";
-fi
+#if [ "$PLATFORM" != "linux-64" ] ; then
+#    export NVCC_PREPEND_FLAGS="-ccbin $CXX";
+#fi
 # These things need to be set for certain cmake versions.
 # The cmake CUDA compiler tests need to see the host env libs
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH $PREFIX/lib"
 export LIBRARIES="$LIBRARIES \"-L$PREFIX/lib\""
 
+      #-D CMAKE_CUDA_COMPILER=${CUDACXX} \
 cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       -D BUILD_SHARED_LIBS=ON \
       -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
@@ -30,11 +32,10 @@ cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       $CMAKE_ARGS \
       $SRC_DIR \
       -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \
-      -D MPI_C_COMPILER="$BUILD_PREFIX/bin/mpicc" \
-      -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \
-      -D CMAKE_CUDA_HOST_LINK_LAUNCHER=$CXX \
-      -D CMAKE_CUDA_COMPILER=$(which nvcc) \
+#      -D MPI_C_COMPILER="$BUILD_PREFIX/bin/mpicc" \
+#      -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \
+#      -D CMAKE_CUDA_HOST_LINK_LAUNCHER=$CXX \
 
 make -j 10 install
 
-source "$RECIPE_DIR/../make-relocatable.sh"
+source "$RECIPE_DIR/../make-relocatable.sh"

.conda/heffte/cuda/meta.yaml

@@ -1,7 +1,7 @@
 {% set version = "1.0.0" %}
-{% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
-{% set cuda_version = "12.3" %}
+{% set linux_compiler_version = "12.4.0" %}
+{% set macos_compiler_version = "16" %}
+#{% set cuda_version = "12.5" %}
 
 package:
   name: fierro-heffte-cuda
@@ -28,11 +28,16 @@ requirements:
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('fortran') }}={{ linux_compiler_version }}
     - openmpi
-    - cuda-toolkit={{ cuda_version }}
+      # - cuda-compiler
+      #    - cuda-toolkit={{ cuda_version }}
+    - cuda-toolkit
   # These host CUDA dependencies are definitely overspecified.
   # Not sure which ones are totally necessary.
   host:
-    - cuda-cudart-static={{ cuda_version }} # Make sure your nvcc version and cudart versions are the same
+    #- cuda-cudart-static={{ cuda_version }} # Make sure your nvcc version and cudart versions are the same
+    - cuda-compiler
+    - cuda-cudart-static
+    - cuda-toolkit
     - libcusolver-dev
     - libcufft-dev
     - libcublas-dev

.conda/trilinos/cpu/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "15.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: fierro-trilinos-cpu

.conda/voxelizer/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package: 
   name: fierro-voxelizer

lib/.gitignore

@@ -1,3 +1,3 @@
-Trilinos
-hdf5
-heffte
+ - Trilinos
+ - hdf5
+ - heffte

scripts/cmake_build.sh

@@ -12,7 +12,7 @@ kokkos_build_type="${3}"
 if { [ ! -d "${ELEMENTS_SOURCE_DIR}/elements" ] || [ ! -d "${ELEMENTS_SOURCE_DIR}/matar/src" ] ;}
 then
     echo "Missing submodules, downloading them...."
-    git submodule update "${ELEMENTS_SOURCE_DIR}"
+    git submodule update --recursive "${ELEMENTS_SOURCE_DIR}"
 fi
 
 if [ ! -d "${TRILINOS_INSTALL_DIR}/lib" ]; then