Skip to content

Commit 452011a

Browse files
authored
mch v7 (#111)
1 parent 9c902a6 commit 452011a

File tree

4 files changed

+66
-51
lines changed

4 files changed

+66
-51
lines changed

recipes/mch/v7/compilers.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ bootstrap:
22
33
gcc:
44
specs:
5-
- gcc@11.3
5+
- gcc@12.3
66
llvm:
7-
requires: gcc@11.3
7+
requires: gcc@12.3
88
specs:
9-
- nvhpc@24.1
9+
- nvhpc@24.5

recipes/mch/v7/environments.yaml

Lines changed: 62 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
1+
tools:
2+
compiler:
3+
- toolchain: gcc
4+
spec: gcc
5+
unify: when_possible
6+
specs:
7+
8+
# removed because it requires deprecated [email protected]
9+
10+
11+
- libtree
12+
- tree
13+
14+
15+
packages:
16+
- perl
17+
views:
18+
tools:
19+
exclude: ['[email protected]']
120
prgenv-nvidia:
221
compiler:
322
- toolchain: gcc
423
spec: gcc
524
- toolchain: llvm
625
spec: nvhpc
7-
unify: when_possible
26+
unify: true
827
mpi:
9-
spec: [email protected].26%nvhpc
28+
spec: [email protected].30%nvhpc
1029
gpu: cuda
1130
packages:
1231
- perl
@@ -16,33 +35,17 @@ prgenv-nvidia:
1635
- automake
1736
specs:
1837
19-
- cuda@11.8
38+
- cuda@12.3
2039
- [email protected]%nvhpc +tools +fortran +aec +openmp jp2k=jasper
21-
- [email protected]%nvhpc +tools +fortran +aec +openmp jp2k=jasper
22-
23-
24-
- [email protected]%nvhpc +szip +hl +fortran +mpi
40+
41+
42+
- hdf5%nvhpc +szip +hl +fortran +mpi
2543
26-
27-
# Explicitly concretise the packages below with gcc as they shouldn't be
28-
# built with nvhpc.
29-
- ca-certificates-mozilla%gcc
30-
- jasper%gcc
31-
- libaec%gcc
32-
- libiconv%gcc
33-
- libjpeg-turbo%gcc
34-
- libtool%gcc
35-
- libxml2%gcc
36-
- m4%gcc
37-
- nasm%gcc
38-
- ncurses%gcc
39-
- openssl%gcc
40-
- patchelf%gcc
41-
- pkgconf%gcc
42-
- xz%gcc
43-
- zlib%gcc
44-
45-
44+
- libfyaml
45+
46+
47+
# the following are explicitly set for backwards compatibility
48+
4649
variants:
4750
- cuda_arch=80
4851
- +mpi
@@ -51,3 +54,35 @@ prgenv-nvidia:
5154
prgenv-icon:
5255
exclude: ['[email protected]']
5356
link: roots
57+
prgenv-gcc:
58+
compiler:
59+
- toolchain: gcc
60+
spec: gcc
61+
unify: when_possible
62+
mpi:
63+
64+
packages:
65+
- perl
66+
- curl
67+
- libx11
68+
specs:
69+
70+
71+
72+
- [email protected] +fortran +threadsafe ~mpi
73+
- [email protected] +fortran +threadsafe +mpi
74+
75+
- [email protected] +tools +fortran +aec +openmp jp2k=jasper
76+
- [email protected]+mpi ^hdf5+mpi api=v18
77+
- [email protected]~mpi ^hdf5~mpi api=v18
78+
- [email protected] ^netcdf-c+mpi
79+
- [email protected] ^netcdf-c~mpi
80+
variants:
81+
- +mpi
82+
views:
83+
prgenv-gcc-serial:
84+
exclude:
85+
- hdf5+mpi
86+
- netcdf-c+mpi
87+
- netcdf-fortran ^netcdf-c+mpi
88+
link: roots

recipes/mch/v7/modules.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,6 @@ modules:
4747
exclude:
4848
4949
50-
- 'autoconf'
51-
- 'automake'
52-
- 'c-blosc'
53-
- 'ca-certificates-mozilla'
54-
- 'diffutils'
55-
- 'gnuconfig'
56-
- 'jasper'
57-
- 'libaec'
58-
- 'libiconv'
59-
- 'libtool'
60-
- 'libxcrypt'
61-
- 'patchelf'
62-
- 'pkgconf'
63-
- 'm4'
64-
- 'ncurses'
65-
- 'openssl'
66-
- 'xz'
6750
projections:
6851
all: '{name}/{version}-{compiler.name}'
6952
nvhpc: '{name}/{version}'

recipes/mch/v7/readme.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
This software stack uses spack v0.19, which requires a specially patched version of stackinator.
2-
3-
* use the `mch-v6-v0.19` branch of stackinator.
4-
* use a separate build cache, because v0.19 caches are not compatible with v0.20 or later
1+
This software stack uses spack v0.21, to macth the spack-c2sm distribution

0 commit comments

Comments
 (0)