Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configs/common/modules_lmod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ modules:
- intel-oneapi-compilers
- intel-oneapi-compilers-classic
- llvm
- nvhpc
# By default, do not create MPI modules
- cray-mpich
- intel-mpi
Expand Down
1 change: 1 addition & 0 deletions configs/common/modules_tcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ modules:
- intel-oneapi-compilers
- intel-oneapi-compilers-classic
- llvm
- nvhpc
# By default, do not create MPI modules
- cray-mpich
- intel-mpi
Expand Down
9 changes: 8 additions & 1 deletion configs/common/packages_nvhpc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ packages:
require:
- nvhpc
# Individual package settings
util-linux-uuid:
require:
- '%c,cxx=gcc'
antlr:
require:
- '%c,cxx=gcc'
Expand Down Expand Up @@ -91,9 +94,13 @@ packages:
py-numpy:
require:
- '%c,cxx=gcc'
py-pyyaml:

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid duplicate packages because of the mixed GCC-NVHPC environment. Since it's in packages_nvhpc.yaml, it won't affect any of the existing builds/compilers.

require:
- '@=6.0.3'
- +libyaml
rust:
require:
- '%c,cxx=gcc'
zstd:
require:
- '%c,cxx=gcc'
- '%c,cxx=gcc'
55 changes: 55 additions & 0 deletions configs/sites/tier1/blueback/packages_nvhpc-26.5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
packages:
all:
require:
- any_of: ['%nvhpc@=26.5']
when: '%nvhpc'
- any_of: ['%gcc@=13.3.0']
when: '%gcc'
mpi:
buildable: false
require:
- cray-mpich@8.1.32
nvhpc:
buildable: false
externals:
- spec: nvhpc@26.5+blas+lapack~mpi
prefix: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5
modules:
- PrgEnv-nvidia/8.7.0
- nvhpc/26.5
extra_attributes:
compilers:
c: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvc
cxx: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvc++
fortran: /p/app/projects/NEPTUNE/spack-stack/nvhpc-26.5/Linux_x86_64/26.5/compilers/bin/nvfortran
environment:
set:
CONFIG_SITE: ''
gcc:
buildable: false
externals:
- spec: gcc@13.3.0 languages:='c,c++'
prefix: /usr
modules:
- PrgEnv-gnu/8.7.0
- gcc-native/13.2
extra_attributes:
compilers:
c: /usr/bin/gcc
cxx: /usr/bin/g++
fortran: /usr/bin/gfortran
environment:
set:
CONFIG_SITE: ''
PE_GCC_EXTERNAL: native
cray-mpich:
buildable: false
externals:
- spec: cray-mpich@8.1.32
prefix: /opt/cray/pe/mpich/8.1.32/ofi/nvidia/23.3
modules:
- cray-mpich/8.1.32
extra_attributes:
environment:
prepend_path:
CMAKE_PREFIX_PATH: /p/app/projects/NEPTUNE/spack-stack/cmake-findmpi
10 changes: 5 additions & 5 deletions configs/templates/neptune-dev-nvhpc/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ spack:
specs:
#- dev-utils-env
- neptune-env ~debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11
- neptune-env +debug +openmp +nvhpc +espc +ncview ^esmf@=9.0.0b11
- neptune-env ~debug ~openmp +nvhpc +espc +ncview ^esmf@=9.0.0b11
- neptune-env +debug ~openmp +nvhpc +espc +ncview ^esmf@=9.0.0b11
- neptune-env +debug +openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11
- neptune-env ~debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11
- neptune-env +debug ~openmp +nvhpc +espc ~ncview ^esmf@=9.0.0b11

- py-numpy
#- py-numpy
#- crtm@3.1.3

packages:
# Turn on python variant for esmf
esmf:
require:
- +python
- ~python
Loading