Merge branch 'release/2.0' of https://github.com/jcsda/spack-stack into feature/merge_rel20_to_develop

Author: climbfuji

configs/sites/tier1/derecho/compilers.yaml

@@ -1,7 +1,6 @@
 packages:
 # Modification of common packages
   all:
-    target: [core2]
     # Use system zlib instead of spack-built zlib-ng
     providers:
       zlib-api:: [zlib]
@@ -26,6 +25,10 @@ packages:
     externals:
     - spec: [email protected]
       prefix: /usr
+  bash:
+    externals:
+    - spec: [email protected]
+      prefix: /usr
   binutils:
     externals:
     - spec: [email protected]
@@ -87,12 +90,6 @@ packages:
     externals:
     - spec: [email protected]
       prefix: /usr
-  # spack concretizer gets confused when omitting %gcc from the external spec (a spack bug?)
-  openssl:
-    buildable: False
-    externals:
-    - spec: [email protected]%gcc
-      prefix: /usr
   pkg-config:
     externals:
     - spec: [email protected]
@@ -101,9 +98,6 @@ packages:
     buildable: False
     externals:
     - spec: [email protected]
-      # Newer versions don't work, some headers are missing
-      #prefix: /glade/u/apps/casper/24.12/spack/opt/spack/qt/5.14.2/gcc/12.4.0/6suc
-      #prefix: /glade/u/apps/casper/24.12/spack/opt/spack/qt/5.14.2/gcc/12.4.0/axtw
       prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/qt/5.14.2/gcc/7.5.0/eqcj
   sed:
     externals:

configs/sites/tier1/derecho/packages.yaml

@@ -0,0 +1,42 @@
+packages:
+  mpi:
+    buildable: False
+    require: [email protected]
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: [email protected] +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.29/ofi/gnu/12.3
+      modules:
+      - ncarenv/24.12
+      - craype/2.7.31
+      - cray-mpich/8.1.29
+      - libfabric/1.15.2.0
+      - cray-pals/1.2.11
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      prefix: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c
+  gcc:
+    buildable: False
+    externals:
+    - spec: [email protected] languages:='c,c++'
+      prefix: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c
+      modules:
+      - ncarenv/24.12
+      - gcc/12.4.0
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gcc
+          cxx: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/g++
+          fortran: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
+        environment:
+          prepend_path:
+            # For compiling scotch (which requires Intel MPI) with gcc in the [email protected] unified environment
+            LD_LIBRARY_PATH: '/glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/lib'
+          set:
+            # https://github.com/JCSDA/spack-stack/issues/957
+            FI_CXI_RX_MATCH_MODE: 'hybrid'
+        extra_rpaths: []
+

configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml

@@ -0,0 +1,42 @@
+packages:
+  mpi:
+    buildable: False
+    require: [email protected]
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: [email protected] +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3
+      modules:
+      - ncarenv/25.10
+      - craype/2.7.34
+      - cray-mpich/8.1.32
+      - libfabric/1.22.0
+      #- cray-pals/1.2.11
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+  gcc:
+    buildable: False
+    externals:
+    - spec: [email protected] languages:='c,c++,fortran'
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+      modules:
+      - ncarenv/25.10
+      - gcc/12.5.0
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gcc
+          cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/g++
+          fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gfortran
+        environment:
+          prepend_path:
+            # For compiling scotch (which requires Intel MPI) with gcc in the [email protected] unified environment
+            LD_LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib:/glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib64
+          set:
+            # https://github.com/JCSDA/spack-stack/issues/957
+            FI_CXI_RX_MATCH_MODE: 'hybrid'
+        extra_rpaths: []
+

configs/sites/tier1/derecho/packages_gcc-12.5.0.yaml

@@ -0,0 +1,75 @@
+packages:
+  mpi:
+    buildable: False
+  cray-mpich:
+    buildable: False
+    externals:
+    - spec: [email protected] +wrappers
+      prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1
+      modules:
+      - ncarenv/25.10
+      - craype/2.7.34
+      - cray-mpich/8.1.32
+      - libfabric/1.22.0
+  intel-oneapi-runtime:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2
+  intel-oneapi-compilers:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2
+      modules:
+        - ncarenv/25.10
+        - intel/2025.2.1
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/bin/icx
+          cxx: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/bin/icpx
+          fortran: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/bin/ifx
+        environment:
+          prepend_path:
+            PATH: '/glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin'
+            CPATH: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/include
+            LD_LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib:/glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib64
+          set:
+            # https://github.com/JCSDA/spack-stack/issues/957
+            FI_CXI_RX_MATCH_MODE: 'hybrid'
+            # https://github.com/JCSDA/spack-stack/issues/1012
+            I_MPI_EXTRA_FILESYSTEM: 'ON'
+        extra_rpaths: []
+  intel-oneapi-mkl:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      prefix: /glade/u/apps/derecho/25.10/spack/opt/spack/intel-oneapi-mkl/2025.2.0/intel-oneapi-compilers/2025.2.1/fj2q
+      modules:
+      - intel-oneapi-mkl/2025.2.0
+  gcc-runtime:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+  gcc:
+    buildable: False
+    externals:
+    - spec: [email protected] languages:='c,c++'
+      prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg
+      modules:
+      - ncarenv/25.10
+      - gcc/12.5.0
+      extra_attributes:
+        compilers:
+          c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gcc
+          cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/g++
+          fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin/gfortran
+        environment:
+          prepend_path:
+            # For compiling scotch (which requires Intel MPI) with gcc in the [email protected] unified environment
+            LD_LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib:/glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2/compiler/2025.2/lib64
+          set:
+            # https://github.com/JCSDA/spack-stack/issues/957
+            FI_CXI_RX_MATCH_MODE: 'hybrid'
+        extra_rpaths: []