Acorn config update (#958)

* Add gcc 10.2.0 to intel compiler envs for Acorn * For Acorn, pin several package versions when using intel 19 * Update preconfigured sites entry for acorn to reflect separate intel 19, 2022 envs
JCSDA · Jan 18, 2024 · 1061e2c · 1061e2c
1 parent 3b680ec
commit 1061e2c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/configs/sites/acorn/compilers.yaml b/configs/sites/acorn/compilers.yaml
@@ -14,6 +14,10 @@ compilers:
     - intel/19.1.3.304
     - libfabric
     environment:
+      prepend_path:
+        PATH: /opt/cray/pe/gcc/10.2.0/bin
+        LD_LIBRARY_PATH: /opt/cray/pe/gcc/10.2.0/snos/lib64
+        CPATH: /opt/cray/pe/gcc/10.2.0/snos/include
       set:
         # OpenSUSE on WCOSS2 machines sets CONFIG_SITE so 
         # Automake-based builds are installed in lib64 
@@ -35,6 +39,10 @@ compilers:
     - intel-classic/2022.2.0.262
     - libfabric
     environment:
+      prepend_path:
+        PATH: /opt/cray/pe/gcc/10.2.0/bin
+        LD_LIBRARY_PATH: /opt/cray/pe/gcc/10.2.0/snos/lib64
+        CPATH: /opt/cray/pe/gcc/10.2.0/snos/include
       set:
         # OpenSUSE on WCOSS2 machines sets CONFIG_SITE so
         # Automake-based builds are installed in lib64

diff --git a/configs/sites/acorn/packages.yaml b/configs/sites/acorn/packages.yaml
@@ -56,3 +56,15 @@
       require:
       - any_of: ["@1.23.1"]
         when: "%[email protected]"
+    eccodes:
+      require:
+      - any_of: ["@2.27.0"]
+        when: "%[email protected]"
+    py-scipy:
+      require:
+      - any_of: ["@1.10.1"]
+        when: "%[email protected]"
+    cdo:
+      require:
+      - any_of: ["@2.0.5"]
+        when: "%[email protected]"
diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst
@@ -30,7 +30,7 @@ Ready-to-use spack-stack 1.6.0 installations are available on the following, ful
 | NCAR-Wyoming        +----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
 |                     | Derecho                          | GCC, Intel      | ``/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/unified-env``                | Dom Heinzeller / Cam Book     |
 +---------------------+----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
-| NOAA (NCEP)         | Acorn                            | Intel           | ``/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.6.0/envs/unified-env``                         | Hang Lei / Alex Richert       |
+| NOAA (NCEP)         | Acorn                            | Intel           | ``/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.6.0/envs/unified-env-intel{19,2022}``          | Hang Lei / Alex Richert       |
 +---------------------+----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
 |                     | Gaea C5                          | Intel           | ``/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/spack-stack-1.6.0/envs/unified-env``              | Cam Book / Dom Heinzeller     |
 |                     +----------------------------------+-----------------+---------------------------------------------------------------------------------------------------------+-------------------------------+