SPR modifications to support api-v2 (Spack v1.x)

.github/build-ci/data/standard_definitions.json

@@ -1,5 +1,6 @@
 {
     "target": "x86_64",
-    "intel_compiler": "[email protected]",
-    "gcc_compiler": "[email protected]"
+    "intel_compiler_ver": "@2021.10.0",
+    "oneapi_compiler_ver": "@2025.2.0",
+    "gcc_compiler_ver": "@13.2.0"
 }

.github/build-ci/manifests/access3/gcc.spack.yaml.j2

@@ -1,12 +1,16 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the gcc_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3 %{{ gcc_compiler }}'
+  # gcc_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3'
   packages:
+    gcc:
+      require:
+        - '{{ gcc_compiler_ver }}'
     all:
       require:
-      - '%{{ gcc_compiler }} target={{ target }}'
+        - '%access_gcc'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/access3/intel.spack.yaml.j2

@@ -1,12 +1,19 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the intel_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3 %{{ intel_compiler }}'
+  # intel_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3'
   packages:
+    python:
+      require:
+        - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+        - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }} target={{ target }}'
+        - '%access_intel'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cable/gcc.spack.yaml.j2

@@ -1,13 +1,17 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the gcc_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} +mpi  %{{ gcc_compiler }}'
-  - '{{ package }} ~mpi %{{ gcc_compiler }}'
+  # gcc_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }} +mpi'
+  - '{{ package }} ~mpi'
   packages:
+    gcc:
+      require:
+        - '{{ gcc_compiler_ver }}'
     all:
       require:
-      - '%{{ gcc_compiler }} target={{ target }}'
+        - '%access_gcc'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cable/intel.spack.yaml.j2

@@ -1,13 +1,20 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the intel_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} +mpi %{{ intel_compiler }}'
-  - '{{ package }} ~mpi %{{ intel_compiler }}'
+  # intel_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }} +mpi'
+  - '{{ package }} ~mpi'
   packages:
+    python:
+      require:
+        - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+        - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }} target={{ target }}'
+        - '%access_intel'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cable/library-gcc.spack.yaml.j2

@@ -1,13 +1,17 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the gcc_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} +mpi library=access-esm1.6 %{{ gcc_compiler }}'
-  - '{{ package }} ~mpi library=access-esm1.6 %{{ gcc_compiler }}'
+  # gcc_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }} +mpi library=access-esm1.6'
+  - '{{ package }} ~mpi library=access-esm1.6'
   packages:
+    gcc:
+      require:
+        - '{{ gcc_compiler_ver }}'
     all:
       require:
-      - '%{{ gcc_compiler }} target={{ target }}'
+        - '%access_gcc'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cable/library-intel.spack.yaml.j2

@@ -1,13 +1,17 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the intel_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} +mpi library=access-esm1.6 %{{ intel_compiler }}'
-  - '{{ package }} ~mpi library=access-esm1.6 %{{ intel_compiler }}'  
+  # intel_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }} +mpi library=access-esm1.6'
+  - '{{ package }} ~mpi library=access-esm1.6'
   packages:
+    intel-oneapi-compilers-classic:
+      require:
+        - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }} target={{ target }}'
+        - '%access_intel'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cice4/intel.spack.yaml.j2

@@ -1,12 +1,19 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the intel_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} %{{ intel_compiler }}'
+  # intel_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }}'
   packages:
+    python:
+      require:
+        - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+        - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }}'
+        - '%access_intel'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cice5/access-esm1.6-intel.spack.yaml.j2

@@ -1,13 +1,20 @@
 spack:
   specs:
-    - 'access-esm1p6 %{{ intel_compiler }}'
+    - 'access-esm1p6'
   packages:
     cice5:
       require:
-        '@git.access-esm1.6=stable'
+      - '@git.access-esm1.6=stable'
+    python:
+      require:
+      - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+      - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }}'
+      - '%access_intel'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cice5/access-om2+deterministic-intel.spack.yaml.j2

@@ -1,11 +1,18 @@
 spack:
   specs:
-    - 'access-om2 +deterministic %{{ intel_compiler }} ^cice5 build_system=cmake nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1'
-    - 'access-om2 +deterministic %{{ intel_compiler }} ^cice5 build_system=makefile'
+    - 'access-om2 +deterministic ^cice5 build_system=cmake nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1'
+    - 'access-om2 +deterministic ^cice5 build_system=makefile'
   packages:
+    python:
+      require:
+      - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+      - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }}'
+      - '%access_intel'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/cice5/access-om2~deterministic-intel.spack.yaml.j2

@@ -1,11 +1,18 @@
 spack:
   specs:
-    - 'access-om2 ~deterministic %{{ intel_compiler }} ^cice5 build_system=cmake nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1'
-    - 'access-om2 ~deterministic %{{ intel_compiler }} ^cice5 build_system=makefile'
+    - 'access-om2 ~deterministic ^cice5 build_system=cmake nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1'
+    - 'access-om2 ~deterministic ^cice5 build_system=makefile'
   packages:
+    python:
+      require:
+      - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+      - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }}'
+      - '%access_intel'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/gcc.spack.yaml.j2

@@ -2,12 +2,16 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the gcc_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} %{{ gcc_compiler }}'
+  # gcc_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }}'
   packages:
+    gcc:
+      require:
+        - '{{ gcc_compiler_ver }}'
     all:
       require:
-      - '%{{ gcc_compiler }}'
+        - '%access_gcc'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/intel.spack.yaml.j2

@@ -2,12 +2,19 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the intel_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} %{{ intel_compiler }}'
+  # intel_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }}'
   packages:
+    python:
+      require:
+        - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+        - '{{ intel_compiler_ver }}'
     all:
       require:
-      - '%{{ intel_compiler }}'
+        - '%access_intel'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/issm/spack.yaml.j2

@@ -5,7 +5,14 @@ spack:
     - ['issm']
     - ['+ad', '~ad']
     - ['+wrappers']
-    - ['%{{ gcc_compiler }}']
+  packages:
+    gcc:
+      require:
+        - '{{ gcc_compiler_ver }}'
+    all:
+      require:
+        - '%access_gcc'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false

.github/build-ci/manifests/oneapi.spack.yaml.j2

@@ -0,0 +1,17 @@
+# This manifest is used by default for packages without a specific manifest under .github/build-ci/manifests/PACKAGE/*.j2
+spack:
+  specs:
+  # package is defined in the workflows inputs.spack-manifest-data-pairs
+  # oneapi_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }}'
+  packages:
+    intel-oneapi-compilers:
+      require:
+        - '{{ oneapi_compiler_ver }}'
+    all:
+      require:
+        - '%access_oneapi'
+        - 'target={{ target }}'
+  concretizer:
+    unify: false
+  view: false

.github/build-ci/manifests/um7/intel.spack.yaml.j2

@@ -2,12 +2,19 @@
 spack:
   specs:
   # package is defined in the workflows inputs.spack-manifest-data-pairs
-  # And the intel_compilers are defined in the standard_definitions.json data file
-  - '{{ package }} %{{ intel_compiler }}'
+  # And the intel_compiler_ver is defined in the standard_definitions.json data file
+  - '{{ package }}'
   packages:
+    intel-oneapi-compilers-classic:
+      require:
+        - '{{ intel_compiler_ver }}'
+    python:
+      require:
+        - '@3.11.14'
     all:
       require:
-      - '%{{ intel_compiler }}'
+        - '%access_intel'
+        - 'target={{ target }}'
   concretizer:
     unify: false
   view: false