#BUG trying fixes for evpfft-cpu publish

lanl · Feb 15, 2024 · e41e90f · e41e90f
1 parent 7eb6d70
commit e41e90f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.conda/evpfft/cpu/meta.yaml b/.conda/evpfft/cpu/meta.yaml
@@ -26,16 +26,16 @@ requirements:
   host:
     - openmpi
     - fierro-heffte
-    - fftw=*=mpi_openmpi_*
+    - fftw=*=mpi* #fftw3 fftw=*=mpi_openmpi_*
     - kokkos=4.1
-    - hdf5=*=mpi_openmpi_*
+    - hdf5=*=mpi* #hdf5=*=mpi_openmpi_*
     - elements
   run:
     - openmpi
     - fierro-heffte
-    - fftw=*=mpi_openmpi_*
+    - fftw3 #fftw=*=mpi_openmpi_*
     - kokkos=4.1
-    - hdf5=*=mpi_openmpi_*
+    - hdf5 #hdf5=*=mpi_openmpi_*
     - elements
 
 #TODO: Add tests

diff --git a/.github/workflows/build-conda-package.yaml b/.github/workflows/build-conda-package.yaml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Update environment
         run:
-          mamba env update -n build-env -f .etc/conda_build_environment.yaml
+          conda env update -n build-env -f .etc/conda_build_environment.yaml
         #if: steps.cache.outputs.cache-hit != 'true'
       - run: |
           if [ ${{ inputs.debug }} = true ] ; then export DEBUG="--debug"; fi;

diff --git a/lib/Elements b/lib/Elements
+6 −16		CMakeLists.txt
+5 −0		examples/CMakeLists.txt
+5 −4		examples/average/test/CMakeLists.txt
+1 −1		matar
+0 −3		scripts/build-elements.sh
+3 −3		scripts/cmake_build_test.sh
+7 −7		scripts/elements-install.sh
+2 −2		scripts/setup-env.sh
+0 −3		src/elements_lib_dummy.cpp
+26 −8		tests/CMakeLists.txt