diff --git a/.conda/evpfft/cpu/meta.yaml b/.conda/evpfft/cpu/meta.yaml index 2be751bdc..71e1a2750 100644 --- 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 index 86c536113..84f6b2174 100644 --- 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 index 19b5cad11..5bfc94f5e 160000 --- a/lib/Elements +++ b/lib/Elements @@ -1 +1 @@ -Subproject commit 19b5cad11d411a914cf188814afb2bd6180c85b7 +Subproject commit 5bfc94f5e176d54ff2ef51f93541440be0c17510