Merge pull request #132 from xylar/fix-chicoma

Many updates for Chicoma support
E3SM-Project · Sep 6, 2023 · c3fa78c · c3fa78c
2 parents d4658f1 + d8704d6
commit c3fa78c
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 48 deletions.
diff --git a/mache/machines/chicoma-cpu.cfg b/mache/machines/chicoma-cpu.cfg
@@ -19,6 +19,9 @@ base_path = /usr/projects/e3sm/e3sm-unified
 # (spack modules are used otherwise)
 use_system_hdf5_netcdf = True
 
+# location of a spack mirror for E3SM-Unified to use
+spack_mirror = /usr/projects/e3sm/e3sm-unified/spack/spack_mirror
+
 
 # config options related to data needed by diagnostics software such as
 # e3sm_diags and MPAS-Analysis

diff --git a/mache/spack/chicoma-cpu_gnu_mpich.csh b/mache/spack/chicoma-cpu_gnu_mpich.csh
@@ -14,22 +14,22 @@ module rm PrgEnv-aocc
 module rm craype-accel-nvidia80
 module rm craype-accel-host
 
-module load PrgEnv-gnu/8.3.3
-module load gcc/12.1.0
+module load PrgEnv-gnu/8.4.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.0.0
-module load cray-mpich/8.1.21
+module load libfabric/1.15.2.0
+module load cray-mpich/8.1.26
 {% if e3sm_hdf5_netcdf %}
 module rm cray-hdf5-parallel
 module rm cray-netcdf-hdf5parallel
 module rm cray-parallel-netcdf
-module load cray-hdf5-parallel/1.12.2.1
-module load cray-netcdf-hdf5parallel/4.9.0.1
-module load cray-parallel-netcdf/1.12.3.1
+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 %}
 
 setenv MPICH_ENV_DISPLAY 1

diff --git a/mache/spack/chicoma-cpu_gnu_mpich.sh b/mache/spack/chicoma-cpu_gnu_mpich.sh
@@ -14,22 +14,22 @@ module rm PrgEnv-aocc
 module rm craype-accel-nvidia80
 module rm craype-accel-host
 
-module load PrgEnv-gnu/8.3.3
-module load gcc/12.1.0
+module load PrgEnv-gnu/8.4.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.0.0
-module load cray-mpich/8.1.21
+module load libfabric/1.15.2.0
+module load cray-mpich/8.1.26
 {% if e3sm_hdf5_netcdf %}
 module rm cray-hdf5-parallel
 module rm cray-netcdf-hdf5parallel
 module rm cray-parallel-netcdf
-module load cray-hdf5-parallel/1.12.2.1
-module load cray-netcdf-hdf5parallel/4.9.0.1
-module load cray-parallel-netcdf/1.12.3.1
+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 %}
 
 export MPICH_ENV_DISPLAY=1

diff --git a/mache/spack/chicoma-cpu_gnu_mpich.yaml b/mache/spack/chicoma-cpu_gnu_mpich.yaml
@@ -16,11 +16,11 @@ spack:
     unify: true
   packages:
     all:
-      compiler: [gcc@12.1.0]
+      compiler: [gcc@12.2.0]
       providers:
-        mpi: [[email protected].21]
+        mpi: [[email protected].26]
 {% if e3sm_lapack %}
-        lapack: [cray-libsci@22.11.1.2]
+        lapack: [cray-libsci@23.05.1.4]
 {% endif %}
     bzip2:
       externals:
@@ -84,74 +84,74 @@ spack:
       buildable: false
     python:
       externals:
-      - spec: python@3.9.7
-        prefix: /usr/projects/hpcsoft/common/x86_64/anaconda/2021.11-python-3.9
+      - spec: python@3.10.9
+        prefix: /usr/projects/hpcsoft/common/x86_64/anaconda/2023.03-python-3.10
         modules:
-        - python/3.9-anaconda-2021.11
+        - python/3.10-anaconda-2023.03
       buildable: false
     gcc:
       externals:
-      - spec: gcc@12.1.0
+      - spec: gcc@12.2.0
         modules:
-        - PrgEnv-gnu/8.3.3
-        - gcc/12.1.0
+        - PrgEnv-gnu/8.4.0
+        - gcc/12.2.0
         - craype-accel-host
         - craype
-        - libfabric/1.15.0.0
+        - libfabric/1.15.2.0
       buildable: false
     cray-mpich:
       externals:
-      - spec: [email protected].21
-        prefix: /opt/cray/pe/mpich/8.1.21/ofi/gnu/9.1
+      - spec: [email protected].26
+        prefix: /opt/cray/pe/mpich/8.1.26/ofi/gnu/9.1
         modules:
-        - libfabric/1.15.0.0
-        - cray-mpich/8.1.21
+        - libfabric/1.15.2.0
+        - cray-mpich/8.1.26
       buildable: false
     libfabric:
       externals:
-      - spec: [email protected].0.0
-        prefix: /opt/cray/libfabric/1.15.0.0
+      - spec: [email protected].2.0
+        prefix: /opt/cray/libfabric/1.15.2.0
         modules:
-        - libfabric/1.15.0.0
+        - libfabric/1.15.2.0
       buildable: false
 {% if e3sm_lapack %}
     cray-libsci:
       externals:
-      - spec: cray-libsci@22.11.1.2
-        prefix: /opt/cray/pe/libsci/22.11.1.2/GNU/9.1/x86_64
+      - spec: cray-libsci@23.05.1.4
+        prefix: /opt/cray/pe/libsci/23.05.1.4/GNU/9.1/x86_64
         modules:
-        - cray-libsci/22.11.1.2
+        - cray-libsci/23.05.1.4
       buildable: false
 {% endif %}
-{% if e3sm_hdf5_netcdf %}
+{% if e3sm_hdf5_netcdf or system_hdf5_netcdf %}
     hdf5:
       externals:
-      - spec: [email protected].1~cxx+fortran+hl~java+mpi+shared
-        prefix: /opt/cray/pe/hdf5-parallel/1.12.2.1/GNU/9.1
+      - spec: [email protected].3~cxx+fortran+hl~java+mpi+shared
+        prefix: /opt/cray/pe/hdf5-parallel/1.12.2.3/GNU/9.1
         modules:
-        - cray-hdf5-parallel/1.12.2.1
+        - cray-hdf5-parallel/1.12.2.3
       buildable: false
     parallel-netcdf:
       externals:
-      - spec: [email protected].1+cxx+fortran+pic+shared
-        prefix: /opt/cray/pe/parallel-netcdf/1.12.3.1/GNU/9.1/
+      - spec: [email protected].3+cxx+fortran+pic+shared
+        prefix: /opt/cray/pe/parallel-netcdf/1.12.3.3/GNU/9.1/
       buildable: false
     netcdf-c:
       externals:
-      - spec: [email protected].1+mpi~parallel-netcdf
-        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.1/GNU/9.1
+      - spec: [email protected].3+mpi~parallel-netcdf
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/GNU/9.1
       buildable: false
     netcdf-fortran:
       externals:
       - spec: [email protected]
-        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.1/GNU/9.1
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/GNU/9.1
       buildable: false
 {% endif %}
   config:
     install_missing_compilers: false
   compilers:
   - compiler:
-      spec: gcc@12.1.0
+      spec: gcc@12.2.0
       paths:
         cc: cc
         cxx: CC
@@ -161,11 +161,11 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - PrgEnv-gnu/8.3.3
-      - gcc/12.1.0
+      - PrgEnv-gnu/8.4.0
+      - gcc/12.2.0
       - craype-accel-host
       - craype
-      - libfabric/1.15.0.0
+      - libfabric/1.15.2.0
       environment:
         prepend_path:
-          PKG_CONFIG_PATH: "/opt/cray/xpmem/2.4.4-2.3_13.8__gff0e1d9.shasta/lib64/pkgconfig"
+          PKG_CONFIG_PATH: "/opt/cray/xpmem/2.5.2-2.4_3.45__gd0f7936.shasta/lib64/pkgconfig"