Skip to content

Commit 6e048b7

Browse files
committed
Update to toolchains
1 parent ed7a140 commit 6e048b7

4 files changed

Lines changed: 20 additions & 8 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"intel_compiler": "intel@2021.10.0",
3-
"gcc_compiler": "gcc@13.2.0",
4-
"oneapi_compiler": "oneapi@2025.2.0",
2+
"intel_compiler_version": "2021.10.0",
3+
"gcc_compiler_version": "13.2.0",
4+
"oneapi_compiler_version": "2025.2.0",
55
"target": "x86_64",
66
"mom5_version": "git.2025.08.000=access-om2",
77
"cice5_version": "git.2025.03.001=access-om2",

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,15 @@ spack:
3535
openmpi:
3636
require:
3737
- '@{{ openmpi_version }}'
38+
39+
# Compilers
40+
gcc:
41+
require:
42+
- '@{{ gcc_compiler_version }}'
3843
all:
3944
require:
40-
- '%{{ gcc_compiler }} target={{ target }}'
45+
- '%access_gcc'
46+
- 'target={{ target }}'
4147
concretizer:
4248
unify: false
4349
view: false

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@ spack:
3535
openmpi:
3636
require:
3737
- '@{{ openmpi_version }}'
38+
# Compilers
39+
intel-oneapi-compilers-classic:
40+
require:
41+
- '@{{ intel_compiler_version }}'
3842
all:
3943
require:
40-
- '%{{ intel_compiler }} target={{ target }}'
44+
- '%access_intel'
45+
- 'target={{ target }}'
4146
concretizer:
4247
unify: false
4348
view: false

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ spack:
3535
openmpi:
3636
require:
3737
- '@{{ openmpi_version }}'
38-
gcc-runtime:
38+
intel-oneapi-compilers-classic:
3939
require:
40-
- '%gcc'
40+
- '@{{ oneapi_compiler_version }}'
4141
all:
4242
require:
43-
- '%{{ oneapi_compiler }} target={{ target }}'
43+
- '%access_oneapi'
44+
- 'target={{ target }}'
4445
concretizer:
4546
unify: false
4647
view: false

0 commit comments

Comments
 (0)