From d55aa3d62dc40506e3c3d1b5666c7ad9bedb1040 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Mon, 21 Oct 2024 15:05:28 -0600 Subject: [PATCH] Update to newer nvidia modules --- mache/spack/chicoma-cpu_nvidia_mpich.csh | 14 +++++----- mache/spack/chicoma-cpu_nvidia_mpich.sh | 14 +++++----- mache/spack/chicoma-cpu_nvidia_mpich.yaml | 31 +++++++++++++---------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.csh b/mache/spack/chicoma-cpu_nvidia_mpich.csh index c19c29d2..3283bba4 100644 --- a/mache/spack/chicoma-cpu_nvidia_mpich.csh +++ b/mache/spack/chicoma-cpu_nvidia_mpich.csh @@ -13,6 +13,8 @@ module rm cray-hdf5-parallel \ cray-parallel-netcdf \ cray-netcdf \ cray-hdf5 \ + gcc \ + gcc-native \ intel \ intel-oneapi \ nvidia \ @@ -34,15 +36,15 @@ module rm cray-hdf5-parallel \ module load PrgEnv-nvidia/8.5.0 \ nvidia/24.7 \ - cray-libsci/23.05.1.4 \ + cray-libsci/23.12.5 \ craype-accel-host \ - cray-mpich/8.1.26 \ - craype \ + craype/2.7.30 \ + cray-mpich/8.1.28 \ cmake/3.27.7 {% if e3sm_hdf5_netcdf %} -module load cray-hdf5-parallel/1.12.2.3 \ - cray-netcdf-hdf5parallel/4.9.0.3 \ - cray-parallel-netcdf/1.12.3.3 +module load cray-hdf5-parallel/1.12.2.9 \ + cray-netcdf-hdf5parallel/4.9.0.9 \ + cray-parallel-netcdf/1.12.3.9 {% endif %} setenv MPICH_ENV_DISPLAY 1 diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.sh b/mache/spack/chicoma-cpu_nvidia_mpich.sh index bd2582c7..528dac5f 100644 --- a/mache/spack/chicoma-cpu_nvidia_mpich.sh +++ b/mache/spack/chicoma-cpu_nvidia_mpich.sh @@ -12,6 +12,8 @@ module rm cray-hdf5-parallel \ cray-parallel-netcdf \ cray-netcdf \ cray-hdf5 \ + gcc \ + gcc-native \ intel \ intel-oneapi \ nvidia \ @@ -33,15 +35,15 @@ module rm cray-hdf5-parallel \ module load PrgEnv-nvidia/8.5.0 \ nvidia/24.7 \ - cray-libsci/23.05.1.4 \ + cray-libsci/23.12.5 \ craype-accel-host \ - cray-mpich/8.1.26 \ - craype \ + craype/2.7.30 \ + cray-mpich/8.1.28 \ cmake/3.27.7 {% if e3sm_hdf5_netcdf %} -module load cray-hdf5-parallel/1.12.2.3 \ - cray-netcdf-hdf5parallel/4.9.0.3 \ - cray-parallel-netcdf/1.12.3.3 +module load cray-hdf5-parallel/1.12.2.9 \ + cray-netcdf-hdf5parallel/4.9.0.9 \ + cray-parallel-netcdf/1.12.3.9 {% endif %} export MPICH_ENV_DISPLAY=1 diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.yaml b/mache/spack/chicoma-cpu_nvidia_mpich.yaml index 7cd2d934..df0d9ca8 100644 --- a/mache/spack/chicoma-cpu_nvidia_mpich.yaml +++ b/mache/spack/chicoma-cpu_nvidia_mpich.yaml @@ -15,8 +15,8 @@ spack: all: compiler: [nvhpc@24.7] providers: - mpi: [cray-mpich@8.1.26] - lapack: [cray-libsci@23.05.1.4] + mpi: [cray-mpich@8.1.28] + lapack: [cray-libsci@23.12.5] bzip2: externals: - spec: bzip2@1.0.6 @@ -91,37 +91,40 @@ spack: buildable: false cray-mpich: externals: - - spec: cray-mpich@8.1.26 + - spec: cray-mpich@8.1.28 modules: - - cray-mpich/8.1.26 + - cray-mpich/8.1.28 buildable: false cray-libsci: externals: - - spec: cray-libsci@23.05.1.4 + - spec: cray-libsci@23.12.5 modules: - - cray-libsci/23.05.1.4 + - cray-libsci/23.12.5 buildable: false {% if e3sm_hdf5_netcdf %} hdf5: externals: - - spec: hdf5@1.12.2.3~cxx+fortran+hl~java+mpi+shared + - spec: hdf5@1.12.2.9~cxx+fortran+hl~java+mpi+shared modules: - - cray-hdf5-parallel/1.12.2.3 + - cray-hdf5-parallel/1.12.2.9 buildable: false parallel-netcdf: externals: - - spec: parallel-netcdf@1.12.3.3+cxx+fortran+pic+shared - prefix: /opt/cray/pe/parallel-netcdf/1.12.3.3/nvidia/20.7 + - spec: parallel-netcdf@1.12.3.9+cxx+fortran+pic+shared + modules: + - cray-parallel-netcdf/1.12.3.9 buildable: false netcdf-c: externals: - - spec: netcdf-c@4.9.0.3+mpi~parallel-netcdf - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/nvidia/20.7 + - spec: netcdf-c@4.9.0.9+mpi~parallel-netcdf + modules: + - cray-netcdf-hdf5parallel/4.9.0.9 buildable: false netcdf-fortran: externals: - spec: netcdf-fortran@4.5.3 - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/nvidia/20.7 + modules: + - cray-netcdf-hdf5parallel/4.9.0.9 buildable: false {% endif %} config: @@ -141,7 +144,7 @@ spack: - PrgEnv-nvidia/8.5.0 - nvidia/24.7 - libfabric/1.15.2.0 - - cray-libsci/23.05.1.4 + - cray-libsci/23.12.5 - craype - craype-accel-host - craype-x86-rome