Separate spack YAMLs for Intel and GCC

NOAA-EMC · Dec 13, 2024 · 41aa50d · 41aa50d
1 parent 32ce9b5
commit 41aa50d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -49,15 +49,12 @@ jobs:
           rm -rf spack
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
-          spack env create gsi-env gsi/ci/spack.yaml
+          spack env create gsi-env gsi/ci/spack_gcc.yaml
           spack env activate gsi-env
           spack compiler find
-          sudo apt install libblas-dev
           spack external find
-          spack add [email protected]
-          spack add openblas
           spack concretize
-          spack install -v --fail-fast --dirty
+          spack install --fail-fast --dirty
           spack clean -a
 
   gsi:

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -75,14 +75,12 @@ jobs:
           rm -rf spack
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
-          spack env create gsi-env gsi/ci/spack.yaml
+          spack env create gsi-env gsi/ci/spack_intel.yaml
           spack env activate gsi-env
           spack compiler find
-          sudo apt install cmake
           spack external find
-          spack add intel-oneapi-mpi
           spack concretize
-          spack install -v --fail-fast --dirty
+          spack install --fail-fast --dirty
           spack clean -a
 
   gsi:

diff --git a/ci/spack_gcc.yaml b/ci/spack_gcc.yaml
@@ -0,0 +1,30 @@
+# Spack environment file to build GSI dependencies
+spack:
+  packages:
+    all:
+      providers:
+        blas: openblas
+        lapack: openblas
+        mpi: mpich
+      compiler:
+        - gcc@13
+  specs:
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  view: true
+  concretizer:
+    unify: true
diff --git a/ci/spack.yaml → ci/spack_intel.yaml b/ci/spack.yaml → ci/spack_intel.yaml
@@ -2,9 +2,10 @@
 spack:
   packages:
     all:
+      providers:
+        mpi: intel-oneapi-mpi
       compiler:
         - intel
-        - gcc@13
   specs:
   - [email protected]
   - [email protected]
@@ -20,6 +21,7 @@ spack:
   - [email protected]
   - [email protected]
   - [email protected]
+  - [email protected]
   view: true
   concretizer:
     unify: true