Skip to content

Commit ea5ee55

Browse files
committed
common-api-v2/gadi/packages.yaml: externals treated as concrete specs (#99)
* As of spack/spack#51118 we need to accommodate: "To be backward compatible with external specs specifying a compiler, for instance mpich %gcc@9, Spack will match the compiler specification to an existing external. It will fail when the specification is ambiguous, or if it does not match any other externals." * We can no longer specify only the compiler name. If we specify the compiler name, then we must include a compiler version.
1 parent e385299 commit ea5ee55

1 file changed

Lines changed: 12 additions & 55 deletions

File tree

common-api-v2/gadi/packages.yaml

Lines changed: 12 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,128 +13,85 @@ packages:
1313
# https://spack.readthedocs.io/en/latest/configuration.html#environment-modifications
1414
externals:
1515
# ACCESS-ESM1.5 & ACCESS-OM2
16-
- spec: openmpi@4.0.2 %gcc
16+
- spec: openmpi@4.0.2 %gcc@13.2.0
1717
prefix: /apps/openmpi/4.0.2
1818
modules: [openmpi/4.0.2]
1919
extra_attributes:
2020
environment:
2121
prepend_path:
2222
CMAKE_PREFIX_PATH: /apps/openmpi/4.0.2/include/GNU
23-
- spec: openmpi@4.0.7 %gcc
23+
- spec: openmpi@4.0.7 %gcc@13.2.0
2424
prefix: /apps/openmpi/4.0.7
2525
modules: [openmpi/4.0.7]
2626
extra_attributes:
2727
environment:
2828
prepend_path:
2929
CMAKE_PREFIX_PATH: /apps/openmpi/4.0.7/include/GNU
30-
- spec: openmpi@4.1.5 %gcc
30+
- spec: openmpi@4.1.5 %gcc@13.2.0
3131
prefix: /apps/openmpi/4.1.5
3232
modules: [openmpi/4.1.5]
3333
extra_attributes:
3434
environment:
3535
prepend_path:
3636
CMAKE_PREFIX_PATH: /apps/openmpi/4.1.5/include/GNU
37-
- spec: openmpi@4.1.7 %gcc
37+
- spec: openmpi@4.1.7 %gcc@13.2.0
3838
prefix: /apps/openmpi/4.1.7
3939
modules: [openmpi/4.1.7]
4040
extra_attributes:
4141
environment:
4242
prepend_path:
4343
CMAKE_PREFIX_PATH: /apps/openmpi/4.1.7/include/GNU
44-
- spec: openmpi@5.0.5 %gcc
44+
- spec: openmpi@5.0.5 %gcc@13.2.0
4545
prefix: /apps/openmpi/5.0.5
4646
modules: [openmpi/5.0.5]
4747
extra_attributes:
4848
environment:
4949
prepend_path:
5050
CMAKE_PREFIX_PATH: /apps/openmpi/5.0.5/include/GNU
51-
- spec: openmpi@5.0.8 %gcc
51+
- spec: openmpi@5.0.8 %gcc@13.2.0
5252
prefix: /apps/openmpi/5.0.8
5353
modules: [openmpi/5.0.8]
5454
extra_attributes:
5555
environment:
5656
prepend_path:
5757
CMAKE_PREFIX_PATH: /apps/openmpi/5.0.8/include/GNU
5858
# ACCESS-ESM1.5 & ACCESS-OM2
59-
- spec: openmpi@4.0.2 %intel
59+
- spec: openmpi@4.0.2
6060
prefix: /apps/openmpi/4.0.2
6161
modules: [openmpi/4.0.2]
6262
extra_attributes:
6363
environment:
6464
prepend_path:
6565
CMAKE_PREFIX_PATH: /apps/openmpi/4.0.2/include/Intel
66-
- spec: openmpi@4.0.7 %intel
66+
- spec: openmpi@4.0.7
6767
prefix: /apps/openmpi/4.0.7
6868
modules: [openmpi/4.0.7]
6969
extra_attributes:
7070
environment:
7171
prepend_path:
7272
CMAKE_PREFIX_PATH: /apps/openmpi/4.0.7/include/Intel
73-
- spec: openmpi@4.1.5 %intel
73+
- spec: openmpi@4.1.5
7474
prefix: /apps/openmpi/4.1.5
7575
modules: [openmpi/4.1.5]
7676
extra_attributes:
7777
environment:
7878
prepend_path:
7979
CMAKE_PREFIX_PATH: /apps/openmpi/4.1.5/include/Intel
80-
- spec: openmpi@4.1.7 %intel
80+
- spec: openmpi@4.1.7
8181
prefix: /apps/openmpi/4.1.7
8282
modules: [openmpi/4.1.7]
8383
extra_attributes:
8484
environment:
8585
prepend_path:
8686
CMAKE_PREFIX_PATH: /apps/openmpi/4.1.7/include/Intel
87-
- spec: openmpi@5.0.5 %intel
87+
- spec: openmpi@5.0.5
8888
prefix: /apps/openmpi/5.0.5
8989
modules: [openmpi/5.0.5]
9090
extra_attributes:
9191
environment:
9292
prepend_path:
9393
CMAKE_PREFIX_PATH: /apps/openmpi/5.0.5/include/Intel
94-
- spec: openmpi@5.0.8 %intel
95-
prefix: /apps/openmpi/5.0.8
96-
modules: [openmpi/5.0.8]
97-
extra_attributes:
98-
environment:
99-
prepend_path:
100-
CMAKE_PREFIX_PATH: /apps/openmpi/5.0.8/include/Intel
101-
# ACCESS-ESM1.5 & ACCESS-OM2
102-
- spec: openmpi@4.0.2 %oneapi
103-
prefix: /apps/openmpi/4.0.2
104-
modules: [openmpi/4.0.2]
105-
extra_attributes:
106-
environment:
107-
prepend_path:
108-
CMAKE_PREFIX_PATH: /apps/openmpi/4.0.2/include/Intel
109-
- spec: openmpi@4.0.7 %oneapi
110-
prefix: /apps/openmpi/4.0.7
111-
modules: [openmpi/4.0.7]
112-
extra_attributes:
113-
environment:
114-
prepend_path:
115-
CMAKE_PREFIX_PATH: /apps/openmpi/4.0.7/include/Intel
116-
- spec: openmpi@4.1.5 %oneapi
117-
prefix: /apps/openmpi/4.1.5
118-
modules: [openmpi/4.1.5]
119-
extra_attributes:
120-
environment:
121-
prepend_path:
122-
CMAKE_PREFIX_PATH: /apps/openmpi/4.1.5/include/Intel
123-
- spec: openmpi@4.1.7 %oneapi
124-
prefix: /apps/openmpi/4.1.7
125-
modules: [openmpi/4.1.7]
126-
extra_attributes:
127-
environment:
128-
prepend_path:
129-
CMAKE_PREFIX_PATH: /apps/openmpi/4.1.7/include/Intel
130-
- spec: openmpi@5.0.5 %oneapi
131-
prefix: /apps/openmpi/5.0.5
132-
modules: [openmpi/5.0.5]
133-
extra_attributes:
134-
environment:
135-
prepend_path:
136-
CMAKE_PREFIX_PATH: /apps/openmpi/5.0.5/include/Intel
137-
- spec: openmpi@5.0.8 %oneapi
94+
- spec: openmpi@5.0.8
13895
prefix: /apps/openmpi/5.0.8
13996
modules: [openmpi/5.0.8]
14097
extra_attributes:

0 commit comments

Comments
 (0)