release/1.8.0: Update derecho site config

configs/sites/tier1/derecho/compilers.yaml

@@ -14,9 +14,9 @@ compilers::
     - intel-classic/2023.2.1
     environment:
       prepend_path:
-        PATH: '/opt/cray/pe/gcc/12.2.0/bin'
-        CPATH: '/opt/cray/pe/gcc/12.2.0/snos/include'
-        LD_LIBRARY_PATH: '/glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/opt/cray/pe/gcc/12.2.0/snos/lib:/opt/cray/pe/gcc/12.2.0/lib64'
+        PATH: '/opt/cray/pe/gcc/11.2.0/snos/bin'
+        CPATH: '/opt/cray/pe/gcc/11.2.0/snos/include'
+        LD_LIBRARY_PATH: '/glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2023.2.1/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/opt/cray/pe/gcc/11.2.0/snos/lib:/opt/cray/pe/gcc/11.2.0/snos/lib64'
       set:
         # https://github.com/JCSDA/spack-stack/issues/957
         FI_CXI_RX_MATCH_MODE: 'hybrid'
@@ -41,4 +41,23 @@ compilers::
         # https://github.com/JCSDA/spack-stack/issues/957
         FI_CXI_RX_MATCH_MODE: 'hybrid'
     extra_rpaths: []
+# Needed for intel
+- compiler:
+    spec: [email protected]
+    paths:
+      cc: /opt/cray/pe/gcc/11.2.0/bin/gcc
+      cxx: /opt/cray/pe/gcc/11.2.0/bin/g++
+      f77: /opt/cray/pe/gcc/11.2.0/bin/gfortran
+      fc: /opt/cray/pe/gcc/11.2.0/bin/gfortran
+    flags: {}
+    operating_system: sles15
+    target: x86_64
+    modules:
+    - ncarenv/23.09
+    - gcc/11.2.0
+    environment:
+      set:
+        # https://github.com/JCSDA/spack-stack/issues/957
+        FI_CXI_RX_MATCH_MODE: 'hybrid'
+    extra_rpaths: []
 

configs/sites/tier1/derecho/config.yaml

@@ -1,2 +1,2 @@
 config:
-  build_jobs: 8
+  build_jobs: 3

configs/sites/tier1/derecho/packages.yaml

@@ -7,6 +7,11 @@ packages:
   # Need to force spack to build python with ssl variant when using older openssl from OS
   python:
     require: "+ssl"
+  # py-scipy 1.12 does not build with intel on Derecho, pin to 1.11.4
+  # use same version with gcc for consistency on the machine
+  py-scipy:
+    require:
+    - '@1.11.4'
 ### All other external packages listed alphabetically
   autoconf:
     externals:
@@ -26,8 +31,8 @@ packages:
       prefix: /usr
   curl:
     externals:
-    - spec: curl@7.79.1+gssapi+ldap+nghttp2
-      prefix: /usr
+    - spec: curl@8.1.2+gssapi+ldap+nghttp2
+      prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/curl/8.1.2/gcc/7.5.0/uq6y
   cvs:
     externals:
     - spec: [email protected]
@@ -36,13 +41,6 @@ packages:
     externals:
     - spec: [email protected]
       prefix: /usr
-  ecflow::
-    buildable: False
-    externals:
-    - spec: [email protected]+ui+static_boost
-      prefix: /glade/work/epicufsrt/contrib/spack-stack/derecho/ecflow-5.8.4
-      modules:
-      - ecflow/5.8.4
   findutils:
     externals:
     - spec: [email protected]
@@ -96,6 +94,11 @@ packages:
     externals:
     - spec: [email protected]
       prefix: /usr
+  qt:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/qt/5.14.2/gcc/7.5.0/eqcj
   sed:
     externals:
     - spec: [email protected]

configs/sites/tier1/derecho/packages_intel.yaml

@@ -1,6 +1,6 @@
 packages:
   all:
-    compiler:: [[email protected],gcc@12.2.0]
+    compiler:: [[email protected],gcc@11.2.0]
     providers:
       mpi:: [[email protected]]
       # Remove the next three lines to switch to intel-oneapi-mkl

doc/source/PreConfiguredSites.rst

@@ -225,7 +225,6 @@ The following is required for building new spack environments with any supported
    export LMOD_TMOD_FIND_FIRST=yes
    module load ncarenv/23.09
    module use /glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles
-   module load ecflow/5.8.4
 
 
 .. _Preconfigured_Sites_Acorn: