Merge pull request #1371 from RatkoVasic-NOAA/1.6.0-C5

Update new machine (Gaea-C6) and upgraded machine (Gaea-C5)
JCSDA · Nov 12, 2024 · bd92bb8 · bd92bb8
2 parents aa9fed8 + 5e3c098
commit bd92bb8
Show file tree

Hide file tree

Showing 8 changed files with 338 additions and 53 deletions.
diff --git a/configs/sites/gaea-c5/compilers.yaml b/configs/sites/gaea-c5/compilers.yaml
@@ -1,22 +1,22 @@
 compilers:
 - compiler:
-    spec: intel@2023.1.0
+    spec: intel@2023.2.0
     paths:
       cc: cc
       cxx: CC
       f77: ftn
       fc: ftn
-    flags: {}
     operating_system: sles15
     modules:
-    - PrgEnv-intel/8.3.3
-    - intel-classic/2023.1.0
-    - craype/2.7.20
+    - PrgEnv-intel/8.5.0
+    - intel-classic/2023.2.0
+    - craype/2.7.30
+    - libfabric/1.20.1
+    flags:
+      cflags: "-gcc-name=/usr/bin/gcc-12"
+      cxxflags: "-gxx-name=/usr/bin/g++-12 -gcc-name=/usr/bin/gcc-12 -static-libstdc++"
+      fflags: "-gcc-name=/usr/bin/gcc-12"
     environment:
-      prepend_path:
-        PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'
-        CPATH: '/opt/cray/pe/gcc/10.3.0/snos/include'
-        LD_LIBRARY_PATH: '/opt/cray/pe/gcc/10.3.0/snos/lib:/opt/cray/pe/gcc/10.3.0/snos/lib64'
       set:
         # OpenSUSE on Gaea C5 sets CONFIG_SITE so
         # Automake-based builds are installed in lib64

diff --git a/configs/sites/gaea-c5/packages.yaml b/configs/sites/gaea-c5/packages.yaml
@@ -1,17 +1,17 @@
 packages:
   all:
-    compiler:: [intel@2023.1.0]
+    compiler:: [intel@2023.2.0]
     providers:
-      mpi:: [cray-mpich@8.1.25]
+      mpi:: [cray-mpich@8.1.28]
 
-### MPI, Python, MKL
+### MPI
   cray-mpich:
     externals:
-    - spec: cray-mpich@8.1.25%intel@2023.1.0~wrappers
-      prefix: /opt/cray/pe/mpich/8.1.25/ofi/intel/19.0
+    - spec: cray-mpich@8.1.28%intel@2023.2.0~wrappers
+#     prefix: /opt/cray/pe/mpich/8.1.28/ofi/intel/2022.1
       modules:
       - craype-network-ofi
-      - cray-mpich/8.1.25
+      - cray-mpich/8.1.28
 
 ### All other external packages listed alphabetically
   autoconf:
@@ -28,13 +28,8 @@ packages:
       prefix: /usr
   binutils:
     externals:
-    - spec: binutils@2.37.20211103
+    - spec: binutils@2.41
       prefix: /usr
-  # Don't use, it's missing the headers
-  #bzip2:
-  #  externals:
-  #  - spec: bzip2@1.0.6
-  #    prefix: /usr
   cmake:
     buildable: false
     externals:
@@ -46,7 +41,7 @@ packages:
       prefix: /usr
   cpio:
     externals:
-    - spec: cpio@2.12
+    - spec: cpio@2.13
       prefix: /usr
   diffutils:
     externals:
@@ -60,8 +55,7 @@ packages:
     buildable: False
     externals:
     - spec: ecflow@5.8.4+ui+static_boost
-      prefix: /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/ecflow-5.8.4
-      modules: [ecflow/5.8.4]
+      prefix: /autofs/ncrc-svm1_proj/epic/spack-stack/ecflow-5.8.4
   file:
     externals:
     - spec: file@5.32
@@ -102,23 +96,22 @@ packages:
       prefix: /usr
   groff:
     externals:
-    - spec: groff@1.22.3
+    - spec: groff@1.22.4
       prefix: /usr
   hwloc:
     externals:
-    - spec: hwloc@2.6.0a1
+    - spec: hwloc@2.9.0
       prefix: /usr
   # This package is currently incomplete (no headers), but still works
   krb5:
     externals:
-    - spec: krb5@1.16.3
-      #prefix: /usr/lib/mit
+    - spec: krb5@1.20
       prefix: /usr
   libfuse:
     externals:
     - spec: libfuse@2.9.7
       prefix: /usr
-    - spec: libfuse@3.6.1
+    - spec: libfuse@3.10.5
       prefix: /usr
   libtirpc:
     variants: ~gssapi
@@ -129,7 +122,7 @@ packages:
       prefix: /usr
   libxml2:
     externals:
-    - spec: libxml2@2.9.7
+    - spec: libxml2@2.10.3
       prefix: /usr
   # This package is currently incomplete (no headers) and doesn't work
   # for us. But it's only needed to build libxaw, for which we can use
@@ -149,16 +142,15 @@ packages:
   mysql:
     buildable: False
     externals:
-    - spec: mysql@8.0.31
-      prefix: /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/mysql-8.0.31
-      modules: [mysql/8.0.31]
+    - spec: mysql@8.0.36
+      prefix: /autofs/ncrc-svm1_proj/epic/spack-stack/mysql-8.0.36
   ncurses:
     externals:
     - spec: ncurses@6.1.20180317+termlib abi=6
       prefix: /usr
   openjdk:
     externals:
-    - spec: openjdk@11.0.16_8-suse-150000.3.83.1-x8664
+    - spec: openjdk@11.0.22
       prefix: /usr
   perl:
     externals:
@@ -172,14 +164,14 @@ packages:
   qt:
     externals:
     - spec: qt@5.15.2
-      prefix: /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/qt-5.15.2/5.15.2/gcc_64
+      prefix: /autofs/ncrc-svm1_proj/epic/spack-stack/qt-5.15.2/5.15.2/gcc_64
   rdma-core:
     externals:
-    - spec: rdma-core@37.0
+    - spec: rdma-core@42.0
       prefix: /usr
   rsync:
     externals:
-    - spec: rsync@3.1.3
+    - spec: rsync@3.2.3
       prefix: /usr
   ruby:
     externals:
@@ -191,20 +183,16 @@ packages:
       prefix: /usr
   slurm:
     externals:
-    - spec: slurm@21.08.8
+    - spec: slurm@24.05.3
       prefix: /usr
   subversion:
     externals:
-    - spec: subversion@1.10.6
+    - spec: subversion@1.14.1
       prefix: /usr
   tar:
     externals:
     - spec: tar@1.34
       prefix: /usr
-  texinfo:
-    externals:
-    - spec: texinfo@6.5
-      prefix: /usr
   wget:
     externals:
     - spec: wget@1.20.3

diff --git a/configs/sites/gaea-c6/compilers.yaml b/configs/sites/gaea-c6/compilers.yaml
@@ -0,0 +1,25 @@
+compilers:
+- compiler:
+    spec: intel@2023.2.0
+    paths:
+      cc: cc
+      cxx: CC
+      f77: ftn
+      fc: ftn
+    operating_system: sles15
+    modules:
+    - PrgEnv-intel/8.5.0
+    - intel-classic/2023.2.0
+    - craype/2.7.30
+    - libfabric/1.20.1
+    flags:
+      cflags: "-gcc-name=/usr/bin/gcc-12"
+      cxxflags: "-gxx-name=/usr/bin/g++-12 -gcc-name=/usr/bin/gcc-12 -static-libstdc++"
+      fflags: "-gcc-name=/usr/bin/gcc-12"
+    environment:
+      set:
+        # OpenSUSE on Gaea C6 sets CONFIG_SITE so
+        # Automake-based builds are installed in lib64
+        # which confuses some packages.
+        CONFIG_SITE: ''
+    extra_rpaths: []
diff --git a/configs/sites/gaea-c6/config.yaml b/configs/sites/gaea-c6/config.yaml
@@ -0,0 +1,2 @@
+config:
+  build_jobs: 6
diff --git a/configs/sites/gaea-c6/mirrors.yaml b/configs/sites/gaea-c6/mirrors.yaml
@@ -0,0 +1,18 @@
+mirrors:
+  local-source:
+    fetch:
+      url: file:///lustre/f2/dev/wpo/role.epic/contrib/spack-stack/source-cache
+      access_pair:
+      - null
+      - null
+      access_token: null
+      profile: null
+      endpoint_url: null
+    push:
+      url: file:///lustre/f2/dev/wpo/role.epic/contrib/spack-stack/source-cache
+      access_pair:
+      - null
+      - null
+      access_token: null
+      profile: null
+      endpoint_url: null
diff --git a/configs/sites/gaea-c6/modules.yaml b/configs/sites/gaea-c6/modules.yaml
@@ -0,0 +1,7 @@
+modules:
+  default:
+    enable::
+    - lmod
+    lmod:
+      include:
+      - python