Merge pull request #228 from xylar/update-config-machines

Update CIME config machines
E3SM-Project · Feb 7, 2025 · ed05487 · ed05487
2 parents 7beef17 + 917a5df
commit ed05487
Show file tree

Hide file tree

Showing 27 changed files with 164 additions and 116 deletions.
diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.csh b/mache/spack/chicoma-cpu_gnu_mpich.csh
@@ -56,7 +56,6 @@ setenv MPICH_VERSION_DISPLAY 1
 setenv HDF5_USE_FILE_LOCKING FALSE
 setenv PERL5LIB /usr/projects/climate/SHARED_CLIMATE/software/chicoma-cpu/perl5-only-switch/lib/perl5
 setenv PNETCDF_HINTS "romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable"
-setenv FI_CXI_RX_MATCH_MODE software
 setenv MPICH_COLL_SYNC MPI_Bcast
 
 # for standalone MPAS builds

diff --git a/mache/spack/chicoma-cpu_gnu_mpich.sh b/mache/spack/chicoma-cpu_gnu_mpich.sh
@@ -56,7 +56,6 @@ export MPICH_VERSION_DISPLAY=1
 export HDF5_USE_FILE_LOCKING=FALSE
 export PERL5LIB=/usr/projects/climate/SHARED_CLIMATE/software/chicoma-cpu/perl5-only-switch/lib/perl5
 export PNETCDF_HINTS="romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable"
-export FI_CXI_RX_MATCH_MODE=software
 export MPICH_COLL_SYNC=MPI_Bcast
 
 export LD_LIBRARY_PATH="/usr/lib64/gcc/x86_64-suse-linux/12:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"

diff --git a/mache/spack/frontier_amdclang_mpich.csh b/mache/spack/frontier_amdclang_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
 

diff --git a/mache/spack/frontier_amdclang_mpich.sh b/mache/spack/frontier_amdclang_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
 

diff --git a/mache/spack/frontier_amdclang_mpich.yaml b/mache/spack/frontier_amdclang_mpich.yaml
@@ -156,7 +156,7 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-amd/8.3.3
       - amd/5.4.0
       - libfabric/1.15.2.0

diff --git a/mache/spack/frontier_amdclanggpu_mpich.csh b/mache/spack/frontier_amdclanggpu_mpich.csh
@@ -1,8 +1,9 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
-module load craype-accel-amd-gfx90a >& /dev/null
+# see https://github.com/E3SM-Project/E3SM/issues/6755
+# module load craype-accel-amd-gfx90a >& /dev/null
 
 {% if e3sm_lapack %}
 module load cray-libsci/22.12.1.1

diff --git a/mache/spack/frontier_amdclanggpu_mpich.sh b/mache/spack/frontier_amdclanggpu_mpich.sh
@@ -1,8 +1,9 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-amd/8.3.3 >& /dev/null
 module switch amd amd/5.4.0 >& /dev/null
-module load craype-accel-amd-gfx90a >& /dev/null
+# see https://github.com/E3SM-Project/E3SM/issues/6755
+# module load craype-accel-amd-gfx90a >& /dev/null
 
 {% if e3sm_lapack %}
 module load cray-libsci/22.12.1.1

diff --git a/mache/spack/frontier_amdclanggpu_mpich.yaml b/mache/spack/frontier_amdclanggpu_mpich.yaml
@@ -156,10 +156,11 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-amd/8.3.3
       - amd/5.4.0
-      - craype-accel-amd-gfx90a
+      # see https://github.com/E3SM-Project/E3SM/issues/6755
+      # - craype-accel-amd-gfx90a
       - libfabric/1.15.2.0
       environment:
         set:

diff --git a/mache/spack/frontier_crayclang_mpich.csh b/mache/spack/frontier_crayclang_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null

diff --git a/mache/spack/frontier_crayclang_mpich.sh b/mache/spack/frontier_crayclang_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null

diff --git a/mache/spack/frontier_crayclang_mpich.yaml b/mache/spack/frontier_crayclang_mpich.yaml
@@ -156,7 +156,7 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-cray/8.3.3
       - cce/15.0.1
       - craype/2.7.20

diff --git a/mache/spack/frontier_crayclanggpu_mpich.csh b/mache/spack/frontier_crayclanggpu_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null

diff --git a/mache/spack/frontier_crayclanggpu_mpich.sh b/mache/spack/frontier_crayclanggpu_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-cray/8.3.3 >& /dev/null
 module switch cce cce/15.0.1 >& /dev/null
 module switch craype craype/2.7.20 >& /dev/null

diff --git a/mache/spack/frontier_crayclanggpu_mpich.yaml b/mache/spack/frontier_crayclanggpu_mpich.yaml
@@ -156,7 +156,7 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-cray/8.3.3
       - cce/15.0.1
       - craype/2.7.20

diff --git a/mache/spack/frontier_gnu_mpich.csh b/mache/spack/frontier_gnu_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/12.2.0 >& /dev/null
 

diff --git a/mache/spack/frontier_gnu_mpich.sh b/mache/spack/frontier_gnu_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/12.2.0 >& /dev/null
 

diff --git a/mache/spack/frontier_gnu_mpich.yaml b/mache/spack/frontier_gnu_mpich.yaml
@@ -171,7 +171,7 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-gnu/8.3.3
       - gcc/12.2.0
       - craype/2.7.19

diff --git a/mache/spack/frontier_gnugpu_mpich.csh b/mache/spack/frontier_gnugpu_mpich.csh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/11.2.0 >& /dev/null
 module load craype-accel-amd-gfx90a

diff --git a/mache/spack/frontier_gnugpu_mpich.sh b/mache/spack/frontier_gnugpu_mpich.sh
@@ -1,5 +1,5 @@
 module reset >& /dev/null
-module switch Core/24.07 >& /dev/null
+module switch Core Core/24.00 >& /dev/null
 module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
 module switch gcc gcc/11.2.0 >& /dev/null
 module load craype-accel-amd-gfx90a

diff --git a/mache/spack/frontier_gnugpu_mpich.yaml b/mache/spack/frontier_gnugpu_mpich.yaml
@@ -172,7 +172,7 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - Core/24.07
+      - Core/24.00
       - PrgEnv-gnu/8.3.3
       - gcc/11.2.0
       - craype/2.7.19

diff --git a/mache/spack/pm-cpu_gnu_mpich.csh b/mache/spack/pm-cpu_gnu_mpich.csh
@@ -51,7 +51,6 @@ setenv MPICH_MPIIO_DVS_MAXNODES 1
 setenv HDF5_USE_FILE_LOCKING FALSE
 ## Not needed
 # setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-setenv FI_CXI_RX_MATCH_MODE software
 setenv FI_MR_CACHE_MONITOR kdreg2
 setenv MPICH_COLL_SYNC MPI_Bcast
 setenv GATOR_INITIAL_MB 4000MB

diff --git a/mache/spack/pm-cpu_gnu_mpich.sh b/mache/spack/pm-cpu_gnu_mpich.sh
@@ -51,7 +51,6 @@ export MPICH_MPIIO_DVS_MAXNODES=1
 export HDF5_USE_FILE_LOCKING=FALSE
 ## Not needed
 # export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-export FI_CXI_RX_MATCH_MODE=software
 export FI_MR_CACHE_MONITOR=kdreg2
 
 if [ -z "${NERSC_HOST:-}" ]; then

diff --git a/mache/spack/pm-cpu_intel_mpich.csh b/mache/spack/pm-cpu_intel_mpich.csh
@@ -49,7 +49,6 @@ setenv MPICH_MPIIO_DVS_MAXNODES 1
 setenv HDF5_USE_FILE_LOCKING FALSE
 ## Not needed
 # setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-setenv FI_CXI_RX_MATCH_MODE software
 setenv FI_MR_CACHE_MONITOR kdreg2
 setenv MPICH_COLL_SYNC MPI_Bcast
 setenv GATOR_INITIAL_MB 4000MB

diff --git a/mache/spack/pm-cpu_intel_mpich.sh b/mache/spack/pm-cpu_intel_mpich.sh
@@ -49,7 +49,6 @@ export MPICH_MPIIO_DVS_MAXNODES=1
 export HDF5_USE_FILE_LOCKING=FALSE
 ## Not needed
 # export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
-export FI_CXI_RX_MATCH_MODE=software
 export FI_MR_CACHE_MONITOR=kdreg2
 
 if [ -z "${NERSC_HOST:-}" ]; then

diff --git a/mache/spack/pm-cpu_nvidia_mpich.csh b/mache/spack/pm-cpu_nvidia_mpich.csh
@@ -52,7 +52,6 @@ setenv HDF5_USE_FILE_LOCKING FALSE
 ## Not needed
 # setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
 setenv MPICH_GPU_SUPPORT_ENABLED 1
-setenv FI_CXI_RX_MATCH_MODE software
 setenv FI_MR_CACHE_MONITOR kdreg2
 setenv MPICH_COLL_SYNC MPI_Bcast
 setenv GATOR_INITIAL_MB 4000MB

diff --git a/mache/spack/pm-cpu_nvidia_mpich.sh b/mache/spack/pm-cpu_nvidia_mpich.sh
@@ -57,7 +57,6 @@ if [ -z "${NERSC_HOST:-}" ]; then
   # happens when building spack environment
   export NERSC_HOST="perlmutter"
 fi
-export FI_CXI_RX_MATCH_MODE=software
 export FI_MR_CACHE_MONITOR=kdreg2
 export MPICH_COLL_SYNC=MPI_Bcast
 export GATOR_INITIAL_MB=4000MB