Revert "FIX: remove openmpi%nvhpc because it fails"

This reverts commit 4635edb20d.
This commit is contained in:
Germann Elsa Sylvia
2022-08-29 12:52:50 +02:00
parent 4635edb20d
commit 38d23ca097

38
env/merlin/spack.yaml vendored
View File

@ -2,7 +2,7 @@ spack:
concretizer: concretizer:
unify: false unify: false
definitions: definitions:
- Compilers: - Compilers: &Compilers
- '%clang@12.0.0' - '%clang@12.0.0'
- '%dpcpp@2022.1.0' - '%dpcpp@2022.1.0'
- '%gcc@12.1.0' - '%gcc@12.1.0'
@ -11,9 +11,9 @@ spack:
- '%oneapi@2022.1.0' - '%oneapi@2022.1.0'
# Careful!! Any external packages shouldn't be placed here, otherwise there is a possibility # Careful!! Any external packages shouldn't be placed here, otherwise there is a possibility
# they'll end with a module pointing to empty paths!! # they'll end with a module pointing to empty paths!!
- Batchsystem_pckgs: - Batchsystem_pckgs: &Batchsystem_pckgs
- slurm - slurm
- Compiler_pckgs: - Compiler_pckgs: &Compiler_pckgs
- atlas - atlas
- boost - boost
- clapack - clapack
@ -34,15 +34,15 @@ spack:
- root - root
- superlu - superlu
- vtk - vtk
- Cuda_pckgs: - Cuda_pckgs: &Cuda_pckgs
- cuda - cuda
- EM_pckgs: - EM_pckgs: &EM_pckgs
- cistem - cistem
- ctffind - ctffind
- motioncor2 - motioncor2
- relion - relion
- unblur - unblur
- Librairies_pckgs: - Librairies_pckgs: &Librairies_pckgs
- alsa-lib - alsa-lib
- gdrcopy - gdrcopy
- giflib - giflib
@ -60,12 +60,12 @@ spack:
- wxwidgets - wxwidgets
- x264 - x264
- zlib - zlib
- MX_pckgs: - MX_pckgs: &MX_pckgs
- cbflib - cbflib
- lz4 - lz4
- openbabel - openbabel
- visit - visit
- HDF5_pckgs: - HDF5_pckgs: &HDF5_pckgs
- alps - alps
- h5hut+mpi - h5hut+mpi
- hdf5-blosc - hdf5-blosc
@ -75,11 +75,11 @@ spack:
- netcdf-fortran - netcdf-fortran
- netcdf-c +parallel-netcdf - netcdf-c +parallel-netcdf
- trilinos - trilinos
- HDF5_serial_pckgs: - HDF5_serial_pckgs: &HDF5_serial_pckgs
- hdf5~mpi - hdf5~mpi
- h5hut~mpi - h5hut~mpi
- ncview - ncview
- MPI_pckgs: - MPI_pckgs: &MPI_pckgs
- amrex - amrex
- boxlib - boxlib
- cp2k - cp2k
@ -90,7 +90,7 @@ spack:
- gromacs - gromacs
- lammps - lammps
- astra - astra
- Programming_pckgs: - Programming_pckgs: &Programming_pckgs
- autoconf - autoconf
- automake - automake
- binutils - binutils
@ -114,7 +114,7 @@ spack:
- r - r
- tcl - tcl
- tk - tk
- System_pckgs: - System_pckgs: &System_pckgs
- bash - bash
- filebench - filebench
- ior - ior
@ -122,7 +122,7 @@ spack:
- nmap - nmap
- patchelf - patchelf
- unison - unison
- Tools_pckgs: - Tools_pckgs: &Tools_pckgs
- aria2 - aria2
- asciidoc - asciidoc
- coreutils - coreutils
@ -545,18 +545,18 @@ spack:
#<<< #<<<
specs: specs:
- matrix: - matrix:
- [cmake,cuda,fftw,gromacs,kokkos,mpich netmod=ucx,nvhpc+mpi,openblas threads=none,openblas threads=openmp, - [cmake,cuda,fftw,gromacs,kokkos,mpich netmod=ucx,nvhpc,openblas threads=none,openblas threads=openmp,
python,root~tbb~x,slurm,gsl] python,root~tbb~x,slurm,gsl]
- ['%gcc'] - ['%gcc']
- matrix: - matrix:
- [boost] - [boost, hdf5~mpi, openmpi]
- ['%clang','%gcc','%nvhpc','%oneapi'] - ['%clang','%gcc','%nvhpc','%oneapi']
- matrix: exclude:
- [hdf5~mpi, openmpi] - hdf5~mpi%clang
- ['%gcc','%oneapi'] - openmpi%clang
- matrix: - matrix:
- [hdf5+mpi +fortran +hl +shared, netcdf-fortran, netcdf-c +parallel-netcdf] - [hdf5+mpi +fortran +hl +shared, netcdf-fortran, netcdf-c +parallel-netcdf]
- ['%gcc','%oneapi'] - ['%gcc','%nvhpc','%oneapi']
- [^openmpi] - [^openmpi]
- intel-oneapi-mpi%oneapi - intel-oneapi-mpi%oneapi
view: view: