Update chicoma-cpu_nvidia_mpich files

E3SM-Project · Oct 18, 2024 · ce0d6e6 · ce0d6e6
1 parent 4ef4408
commit ce0d6e6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.csh b/mache/spack/chicoma-cpu_nvidia_mpich.csh
@@ -5,19 +5,19 @@ setenv HTTP_PROXY http://proxyout.lanl.gov:8080
 setenv HTTPS_PROXY http://proxyout.lanl.gov:8080
 setenv FTP_PROXY http://proxyout.lanl.gov:8080
 
-source /usr/share/lmod/8.3.1/init/csh
+source /usr/share/lmod/lmod/init/csh
 
+module rm craype-accel-nvidia80
+module rm craype-accel-host
+module rm cray-libsci
 module rm PrgEnv-gnu
 module rm PrgEnv-nvidia
 module rm PrgEnv-cray
 module rm PrgEnv-aocc
-module rm craype-accel-nvidia80
-module rm craype-accel-host
 
 module load PrgEnv-nvidia/8.4.0
 module load nvidia/22.7
 module load craype-x86-milan
-module load libfabric/1.15.2.0
 module load craype-accel-host
 module load craype
 module load cray-mpich/8.1.26
@@ -32,6 +32,7 @@ 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
 {% 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
@@ -5,19 +5,19 @@ export HTTP_PROXY=http://proxyout.lanl.gov:8080
 export HTTPS_PROXY=http://proxyout.lanl.gov:8080
 export FTP_PROXY=http://proxyout.lanl.gov:8080
 
-source /usr/share/lmod/8.3.1/init/sh
+source /usr/share/lmod/lmod/init/sh
 
+module rm craype-accel-nvidia80
+module rm craype-accel-host
+module rm cray-libsci
 module rm PrgEnv-gnu
 module rm PrgEnv-nvidia
 module rm PrgEnv-cray
 module rm PrgEnv-aocc
-module rm craype-accel-nvidia80
-module rm craype-accel-host
 
 module load PrgEnv-nvidia/8.4.0
 module load nvidia/22.7
 module load craype-x86-milan
-module load libfabric/1.15.2.0
 module load craype-accel-host
 module load craype
 module load cray-mpich/8.1.26
@@ -32,6 +32,7 @@ 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
 {% 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
@@ -28,8 +28,8 @@ spack:
       buildable: false
     cmake:
       externals:
-      - spec: cmake@3.25.1
-        prefix: /usr/projects/hpcsoft/cos2/common/x86_64/cmake/3.25.1
+      - spec: cmake@3.27.7
+        prefix: /usr/projects/hpcsoft/tce/23-05/cos2-x86_64-cc80/packages/cmake/cmake-3.27.7/
       buildable: false
     curl:
       externals:
@@ -98,16 +98,8 @@ spack:
       - spec: [email protected]
         prefix: /opt/cray/pe/mpich/8.1.26/ofi/nvidia/20.7
         modules:
-        - libfabric/1.15.2.0
         - cray-mpich/8.1.26
       buildable: false
-    libfabric:
-      externals:
-      - spec: [email protected]
-        prefix: /opt/cray/libfabric/1.15.2.0
-        modules:
-        - libfabric/1.15.2.0
-      buildable: false
 {% if e3sm_lapack %}
     cray-libsci:
       externals:
@@ -157,7 +149,6 @@ spack:
       - nvidia/22.7
       - craype-x86-milan
       - craype-accel-host
-      - libfabric/1.15.2.0
       environment:
         prepend_path:
           PKG_CONFIG_PATH: "/opt/cray/xpmem/2.5.2-2.4_3.45__gd0f7936.shasta/lib64/pkgconfig"