Update chicoma-cpu_gnu_mpich files

E3SM-Project · Oct 18, 2024 · e3efdb0 · e3efdb0
1 parent cfd6d46
commit e3efdb0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.csh b/mache/spack/chicoma-cpu_gnu_mpich.csh
@@ -5,23 +5,23 @@ 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-gnu/8.4.0
+module load PrgEnv-gnu/8.5.0
 module load gcc/12.2.0
 module load craype-accel-host
 {% if e3sm_lapack %}
 module load cray-libsci
 {% endif %}
 module load craype
-module load libfabric/1.15.2.0
 module load cray-mpich/8.1.26
 {% if e3sm_hdf5_netcdf %}
 module rm cray-hdf5-parallel
@@ -31,6 +31,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
@@ -44,4 +45,4 @@ setenv PNETCDF_HINTS "romio_ds_write=disable;romio_ds_read=disable;romio_cb_writ
 setenv FI_CXI_RX_MATCH_MODE software
 setenv MPICH_COLL_SYNC MPI_Bcast
 
-setenv LD_LIBRARY_PATH $CRAY_LD_LIBRARY_PATH:$LD_LIBRARY_PATH
+setenv LD_LIBRARY_PATH="/opt/cray/pe/gcc/12.2.0/snos/lib64:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.sh b/mache/spack/chicoma-cpu_gnu_mpich.sh
@@ -5,23 +5,23 @@ 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-gnu/8.4.0
+module load PrgEnv-gnu/8.5.0
 module load gcc/12.2.0
 module load craype-accel-host
 {% if e3sm_lapack %}
 module load cray-libsci
 {% endif %}
 module load craype
-module load libfabric/1.15.2.0
 module load cray-mpich/8.1.26
 {% if e3sm_hdf5_netcdf %}
 module rm cray-hdf5-parallel
@@ -31,6 +31,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
@@ -44,4 +45,4 @@ export PNETCDF_HINTS="romio_ds_write=disable;romio_ds_read=disable;romio_cb_writ
 export FI_CXI_RX_MATCH_MODE=software
 export MPICH_COLL_SYNC=MPI_Bcast
 
-export LD_LIBRARY_PATH=$CRAY_LD_LIBRARY_PATH:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="/opt/cray/pe/gcc/12.2.0/snos/lib64:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.yaml b/mache/spack/chicoma-cpu_gnu_mpich.yaml
@@ -27,6 +27,11 @@ spack:
       - spec: [email protected]
         prefix: /usr
       buildable: false
+    cmake:
+      externals:
+      - spec: [email protected]
+        prefix: /usr/projects/hpcsoft/cos2/common/x86_64/cmake/3.27.7
+      buildable: false
     curl:
       externals:
       - spec: [email protected]
@@ -93,27 +98,18 @@ spack:
       externals:
       - spec: [email protected]
         modules:
-        - PrgEnv-gnu/8.4.0
+        - PrgEnv-gnu/8.5.0
         - gcc/12.2.0
         - craype-accel-host
         - craype
-        - libfabric/1.15.2.0
       buildable: false
     cray-mpich:
       externals:
       - spec: [email protected]
         prefix: /opt/cray/pe/mpich/8.1.26/ofi/gnu/9.1
         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:
@@ -161,7 +157,7 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - PrgEnv-gnu/8.4.0
+      - PrgEnv-gnu/8.5.0
       - gcc/12.2.0
       - craype-accel-host
       - craype