Skip to content

Commit 9c55156

Browse files
harshulaCodeGat
harshula
and
CodeGat
committed
CI: use Spack v1.1
* .github/build-ci/data/standard_definitions.json: * Change syntax to suit toolchains * Update spack.yaml templates to use Spack v1.x compiler toolchains syntax * .github/workflows/ci.yml: * DEFAULT_SPACK_REF: 'releases/v1.1' * Disable gcom, gcom4 and um because they need Gadi * Increase max-parallel to 7 * Remove access-om3 from manifests * Set builtin-spack-packages-ref: 39aeb9dbcc13b6a53e40c77b672c397e1f4c93ec * Add a generic intel-oneapi-compilers test * %intel@2021.10.0 can not compile the latest version of python * Require python 3.11.14. PR 346: * .github/workflows/ci.yml: disable SBRs * Consolidate all refs to packages path under env.PACKAGES_ROOT_DIR * Update paths to `api-v2` format * Replace `_` from directory name with `-` for package names * Swap filepath and template_value so package name comes first in matrix Co-authored-by: Tommy Gatti <tommy.gatti@anu.edu.au>
1 parent 6a47970 commit 9c55156

19 files changed

Lines changed: 179 additions & 90 deletions

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"target": "x86_64",
3-
"intel_compiler": "intel@2021.10.0",
4-
"gcc_compiler": "gcc@13.2.0"
3+
"intel_compiler_ver": "@2021.10.0",
4+
"oneapi_compiler_ver": "@2025.2.0",
5+
"gcc_compiler_ver": "@13.2.0"
56
}

‎.github/build-ci/manifests/access-om3/gcc.spack.yaml.j2‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.github/build-ci/manifests/access-om3/intel.spack.yaml.j2‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
spack:
22
specs:
33
# package is defined in the workflows inputs.spack-manifest-data-pairs
4-
# And the gcc_compilers are defined in the standard_definitions.json data file
5-
- '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3 %{{ gcc_compiler }}'
4+
# gcc_compiler_ver is defined in the standard_definitions.json data file
5+
- '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3'
66
packages:
7+
gcc:
8+
require:
9+
- '{{ gcc_compiler_ver }}'
710
all:
811
require:
9-
- '%{{ gcc_compiler }} target={{ target }}'
12+
- '%access_gcc'
13+
- 'target={{ target }}'
1014
concretizer:
1115
unify: false
1216
view: false

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
spack:
22
specs:
33
# package is defined in the workflows inputs.spack-manifest-data-pairs
4-
# And the intel_compilers are defined in the standard_definitions.json data file
5-
- '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3 %{{ intel_compiler }}'
4+
# intel_compiler_ver is defined in the standard_definitions.json data file
5+
- '{{ package }} configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3'
66
packages:
7+
python:
8+
require:
9+
- '@3.11.14'
10+
intel-oneapi-compilers-classic:
11+
require:
12+
- '{{ intel_compiler_ver }}'
713
all:
814
require:
9-
- '%{{ intel_compiler }} target={{ target }}'
15+
- '%access_intel'
16+
- 'target={{ target }}'
1017
concretizer:
1118
unify: false
1219
view: false

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
spack:
22
specs:
33
# package is defined in the workflows inputs.spack-manifest-data-pairs
4-
# And the gcc_compilers are defined in the standard_definitions.json data file
5-
- '{{ package }} +mpi %{{ gcc_compiler }}'
6-
- '{{ package }} ~mpi %{{ gcc_compiler }}'
4+
# gcc_compiler_ver is defined in the standard_definitions.json data file
5+
- '{{ package }} +mpi'
6+
- '{{ package }} ~mpi'
77
packages:
8+
gcc:
9+
require:
10+
- '{{ gcc_compiler_ver }}'
811
all:
912
require:
10-
- '%{{ gcc_compiler }} target={{ target }}'
13+
- '%access_gcc'
14+
- 'target={{ target }}'
1115
concretizer:
1216
unify: false
1317
view: false

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
spack:
22
specs:
33
# package is defined in the workflows inputs.spack-manifest-data-pairs
4-
# And the intel_compilers are defined in the standard_definitions.json data file
5-
- '{{ package }} +mpi %{{ intel_compiler }}'
6-
- '{{ package }} ~mpi %{{ intel_compiler }}'
4+
# intel_compiler_ver is defined in the standard_definitions.json data file
5+
- '{{ package }} +mpi'
6+
- '{{ package }} ~mpi'
77
packages:
8+
python:
9+
require:
10+
- '@3.11.14'
11+
intel-oneapi-compilers-classic:
12+
require:
13+
- '{{ intel_compiler_ver }}'
814
all:
915
require:
10-
- '%{{ intel_compiler }} target={{ target }}'
16+
- '%access_intel'
17+
- 'target={{ target }}'
1118
concretizer:
1219
unify: false
1320
view: false

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
spack:
22
specs:
33
# package is defined in the workflows inputs.spack-manifest-data-pairs
4-
# And the gcc_compilers are defined in the standard_definitions.json data file
5-
- '{{ package }} +mpi library=access-esm1.6 %{{ gcc_compiler }}'
6-
- '{{ package }} ~mpi library=access-esm1.6 %{{ gcc_compiler }}'
4+
# gcc_compiler_ver is defined in the standard_definitions.json data file
5+
- '{{ package }} +mpi library=access-esm1.6'
6+
- '{{ package }} ~mpi library=access-esm1.6'
77
packages:
8+
gcc:
9+
require:
10+
- '{{ gcc_compiler_ver }}'
811
all:
912
require:
10-
- '%{{ gcc_compiler }} target={{ target }}'
13+
- '%access_gcc'
14+
- 'target={{ target }}'
1115
concretizer:
1216
unify: false
1317
view: false

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
spack:
22
specs:
33
# package is defined in the workflows inputs.spack-manifest-data-pairs
4-
# And the intel_compilers are defined in the standard_definitions.json data file
5-
- '{{ package }} +mpi library=access-esm1.6 %{{ intel_compiler }}'
6-
- '{{ package }} ~mpi library=access-esm1.6 %{{ intel_compiler }}'
4+
# intel_compiler_ver is defined in the standard_definitions.json data file
5+
- '{{ package }} +mpi library=access-esm1.6'
6+
- '{{ package }} ~mpi library=access-esm1.6'
77
packages:
8+
intel-oneapi-compilers-classic:
9+
require:
10+
- '{{ intel_compiler_ver }}'
811
all:
912
require:
10-
- '%{{ intel_compiler }} target={{ target }}'
13+
- '%access_intel'
14+
- 'target={{ target }}'
1115
concretizer:
1216
unify: false
1317
view: false

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
spack:
22
specs:
33
# package is defined in the workflows inputs.spack-manifest-data-pairs
4-
# And the intel_compilers are defined in the standard_definitions.json data file
5-
- '{{ package }} %{{ intel_compiler }}'
4+
# intel_compiler_ver is defined in the standard_definitions.json data file
5+
- '{{ package }}'
66
packages:
7+
python:
8+
require:
9+
- '@3.11.14'
10+
intel-oneapi-compilers-classic:
11+
require:
12+
- '{{ intel_compiler_ver }}'
713
all:
814
require:
9-
- '%{{ intel_compiler }}'
15+
- '%access_intel'
16+
- 'target={{ target }}'
1017
concretizer:
1118
unify: false
1219
view: false

0 commit comments

Comments
 (0)
⚡