diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.csh b/mache/spack/chicoma-cpu_nvidia_mpich.csh index e5cdc9f8..c19c29d2 100644 --- a/mache/spack/chicoma-cpu_nvidia_mpich.csh +++ b/mache/spack/chicoma-cpu_nvidia_mpich.csh @@ -7,44 +7,43 @@ setenv FTP_PROXY http://proxyout.lanl.gov:8080 source /usr/share/lmod/lmod/init/csh -module rm cray-hdf5-parallel -module rm cray-netcdf-hdf5parallel -module rm cray-parallel-netcdf -module rm cray-netcdf -module rm cray-hdf5 -module rm intel -module rm intel-oneapi -module rm nvidia -module rm aocc -module rm cudatoolkit -module rm climate-utils -module rm cray-libsci -module rm craype-accel-nvidia80 -module rm craype-accel-host -module rm perftools-base -module rm perftools -module rm darshan -module rm PrgEnv-gnu -module rm PrgEnv-intel -module rm PrgEnv-nvidia -module rm PrgEnv-cray -module rm PrgEnv-aocc -module load PrgEnv-nvidia/8.4.0 -module load nvidia/22.7 -module load craype-x86-milan -module load craype-accel-host -module load craype -module load cray-mpich/8.1.26 -{% if e3sm_lapack %} -module load cray-libsci/23.05.1.4 -{% endif %} +module rm cray-hdf5-parallel \ + cray-netcdf-hdf5parallel \ + cray-parallel-netcdf \ + cray-netcdf \ + cray-hdf5 \ + intel \ + intel-oneapi \ + nvidia \ + aocc \ + cudatoolkit \ + climate-utils \ + cray-libsci \ + craype \ + craype-accel-nvidia80 \ + craype-accel-host \ + perftools-base \ + perftools \ + darshan \ + PrgEnv-gnu \ + PrgEnv-intel \ + PrgEnv-nvidia \ + PrgEnv-cray \ + PrgEnv-aocc + +module load PrgEnv-nvidia/8.5.0 \ + nvidia/24.7 \ + cray-libsci/23.05.1.4 \ + craype-accel-host \ + cray-mpich/8.1.26 \ + craype \ + cmake/3.27.7 {% if e3sm_hdf5_netcdf %} -module load cray-hdf5-parallel/1.12.2.3 -module load cray-netcdf-hdf5parallel/4.9.0.3 -module load cray-parallel-netcdf/1.12.3.3 +module load cray-hdf5-parallel/1.12.2.3 \ + cray-netcdf-hdf5parallel/4.9.0.3 \ + cray-parallel-netcdf/1.12.3.3 {% endif %} -module load cmake/3.27.7 setenv MPICH_ENV_DISPLAY 1 setenv MPICH_VERSION_DISPLAY 1 diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.sh b/mache/spack/chicoma-cpu_nvidia_mpich.sh index e4e07174..bd2582c7 100644 --- a/mache/spack/chicoma-cpu_nvidia_mpich.sh +++ b/mache/spack/chicoma-cpu_nvidia_mpich.sh @@ -7,44 +7,42 @@ export FTP_PROXY=http://proxyout.lanl.gov:8080 source /usr/share/lmod/lmod/init/sh -module rm cray-hdf5-parallel -module rm cray-netcdf-hdf5parallel -module rm cray-parallel-netcdf -module rm cray-netcdf -module rm cray-hdf5 -module rm intel -module rm intel-oneapi -module rm nvidia -module rm aocc -module rm cudatoolkit -module rm climate-utils -module rm cray-libsci -module rm craype-accel-nvidia80 -module rm craype-accel-host -module rm perftools-base -module rm perftools -module rm darshan -module rm PrgEnv-gnu -module rm PrgEnv-intel -module rm PrgEnv-nvidia -module rm PrgEnv-cray -module rm PrgEnv-aocc +module rm cray-hdf5-parallel \ + cray-netcdf-hdf5parallel \ + cray-parallel-netcdf \ + cray-netcdf \ + cray-hdf5 \ + intel \ + intel-oneapi \ + nvidia \ + aocc \ + cudatoolkit \ + climate-utils \ + cray-libsci \ + craype \ + craype-accel-nvidia80 \ + craype-accel-host \ + perftools-base \ + perftools \ + darshan \ + PrgEnv-gnu \ + PrgEnv-intel \ + PrgEnv-nvidia \ + PrgEnv-cray \ + PrgEnv-aocc -module load PrgEnv-nvidia/8.4.0 -module load nvidia/22.7 -module load craype-x86-milan -module load craype-accel-host -module load craype -module load cray-mpich/8.1.26 -{% if e3sm_lapack %} -module load cray-libsci/23.05.1.4 -{% endif %} +module load PrgEnv-nvidia/8.5.0 \ + nvidia/24.7 \ + cray-libsci/23.05.1.4 \ + craype-accel-host \ + cray-mpich/8.1.26 \ + craype \ + cmake/3.27.7 {% if e3sm_hdf5_netcdf %} -module load cray-hdf5-parallel/1.12.2.3 -module load cray-netcdf-hdf5parallel/4.9.0.3 -module load cray-parallel-netcdf/1.12.3.3 +module load cray-hdf5-parallel/1.12.2.3 \ + cray-netcdf-hdf5parallel/4.9.0.3 \ + cray-parallel-netcdf/1.12.3.3 {% endif %} -module load cmake/3.27.7 export MPICH_ENV_DISPLAY=1 export MPICH_VERSION_DISPLAY=1 diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.yaml b/mache/spack/chicoma-cpu_nvidia_mpich.yaml index 7fac0b74..7cd2d934 100644 --- a/mache/spack/chicoma-cpu_nvidia_mpich.yaml +++ b/mache/spack/chicoma-cpu_nvidia_mpich.yaml @@ -1,9 +1,7 @@ spack: specs: - cray-mpich -{% if e3sm_lapack %} - cray-libsci -{% endif %} {% if e3sm_hdf5_netcdf %} - hdf5 - netcdf-c @@ -15,12 +13,10 @@ spack: unify: true packages: all: - compiler: [nvhpc@22.7] + compiler: [nvhpc@24.7] providers: mpi: [cray-mpich@8.1.26] -{% if e3sm_lapack %} lapack: [cray-libsci@23.05.1.4] -{% endif %} bzip2: externals: - spec: bzip2@1.0.6 @@ -99,14 +95,12 @@ spack: modules: - cray-mpich/8.1.26 buildable: false -{% if e3sm_lapack %} cray-libsci: externals: - spec: cray-libsci@23.05.1.4 modules: - cray-libsci/23.05.1.4 buildable: false -{% endif %} {% if e3sm_hdf5_netcdf %} hdf5: externals: @@ -134,20 +128,23 @@ spack: install_missing_compilers: false compilers: - compiler: - spec: nvhpc@22.7 + spec: nvhpc@24.7 paths: - cc: /opt/nvidia/hpc_sdk/Linux_x86_64/22.7/compilers/bin/nvc - cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/22.7/compilers/bin/nvc++ - f77: /opt/nvidia/hpc_sdk/Linux_x86_64/22.7/compilers/bin/nvfortran - fc: /opt/nvidia/hpc_sdk/Linux_x86_64/22.7/compilers/bin/nvfortran + cc: /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin/nvc + cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin/nvc++ + f77: /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin/nvfortran + fc: /opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin/nvfortran flags: {} operating_system: sles15 target: any modules: - - PrgEnv-nvidia/8.4.0 - - nvidia/22.7 - - craype-x86-milan + - PrgEnv-nvidia/8.5.0 + - nvidia/24.7 + - libfabric/1.15.2.0 + - cray-libsci/23.05.1.4 + - craype - craype-accel-host + - craype-x86-rome environment: prepend_path: PKG_CONFIG_PATH: "/opt/cray/xpmem/2.5.2-2.4_3.45__gd0f7936.shasta/lib64/pkgconfig"