Skip to content

Commit 875e04d

Browse files
RatkoVasic-NOAARatkoVasic-NOAA
authored
Cherry-pick config files from [email protected] (#1696)
Update config files for Hera, Gaea-C6, Orion, Hercules and NOAA cloud (GCP, AWS and Azure) for release/1.9.2
1 parent f4b9b40 commit 875e04d

23 files changed

+138
-83
lines changed

‎configs/sites/tier1/derecho/compilers.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ compilers::
3737
- ncarenv/23.09
3838
- gcc/12.2.0
3939
environment:
40+
prepend_path:
41+
# For compiling scotch (which requires Intel MPI) with gcc in the [email protected] unified environment
42+
LD_LIBRARY_PATH: '/glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2024.2.1/compiler/2024.2/lib'
4043
set:
4144
# https://github.com/JCSDA/spack-stack/issues/957
4245
FI_CXI_RX_MATCH_MODE: 'hybrid'

‎configs/sites/tier1/derecho/packages.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
packages:
2+
# Modification of common packages
23
all:
34
target: [core2]
4-
5-
### Modification of common packages
5+
# Use system zlib instead of spack-built zlib-ng
6+
providers:
7+
zlib-api:: [zlib]
8+
zlib-api:
9+
buildable: False
10+
zlib:
11+
buildable: False
12+
externals:
13+
- spec: [email protected]
14+
prefix: /usr
615
# Tell esmf that this is not a 'normal' Cray ...
716
esmf:
817
require:

‎configs/sites/tier1/hera/compilers.yaml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ compilers:
88
fc: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort
99
flags: {}
1010
operating_system: rocky8
11+
target: x86_64
1112
modules:
1213
- intel/2022.1.2
1314
environment:
@@ -17,17 +18,23 @@ compilers:
1718
CPATH: '/apps/gnu/gcc-9.2.0/include'
1819
extra_rpaths: []
1920
- compiler:
20-
spec: gcc@13.2.0
21+
spec: gcc@13.3.0
2122
paths:
22-
cc: /apps/gnu/gcc-13.2.0/bin/gcc
23-
cxx: /apps/gnu/gcc-13.2.0/bin/g++
24-
f77: /apps/gnu/gcc-13.2.0/bin/gfortran
25-
fc: /apps/gnu/gcc-13.2.0/bin/gfortran
23+
cc: /contrib/spack-stack/installs/gnu/13.3.0/bin/gcc
24+
cxx: /contrib/spack-stack/installs/gnu/13.3.0/bin/g++
25+
f77: /contrib/spack-stack/installs/gnu/13.3.0/bin/gfortran
26+
fc: /contrib/spack-stack/installs/gnu/13.3.0/bin/gfortran
2627
flags: {}
2728
operating_system: rocky8
29+
target: x86_64
2830
modules:
29-
- gnu/13.2.0
30-
environment: {}
31+
- gnu/13.3.0
32+
environment:
33+
prepend_path:
34+
MODULEPATH: '/contrib/spack-stack/installs/gnu/modulefiles'
35+
PATH: '/contrib/spack-stack/installs/ucx/ucx-1.20.0/bin'
36+
LD_LIBRARY_PATH: '/contrib/spack-stack/installs/ucx/ucx-1.20.0/lib'
37+
PKG_CONFIG_PATH: '/contrib/spack-stack/installs/ucx/ucx-1.20.0/lib/pkgconfig'
3138
extra_rpaths: []
3239
- compiler:
3340
spec: [email protected]
@@ -38,6 +45,7 @@ compilers:
3845
fc: /apps/oneapi/compiler/2024.2/bin/ifort
3946
flags: {}
4047
operating_system: rocky8
48+
target: x86_64
4149
modules:
4250
- intel/2024.2.1
4351
environment:

‎configs/sites/tier1/hera/packages.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ packages:
22
all:
33
# To support hecflow01
44
target: [haswell]
5+
providers:
6+
zlib-api:: [zlib]
7+
zlib-api:
8+
buildable: False
9+
zlib:
10+
buildable: False
11+
externals:
12+
- spec: [email protected]
13+
prefix: /usr
514
autoconf:
615
externals:
716
- spec: [email protected]

‎configs/sites/tier1/hera/packages_gcc.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
packages:
22
all:
3-
compiler:: [gcc@13.2.0]
3+
compiler:: [gcc@13.3.0]
44
providers:
55
mpi:: [[email protected]]
66
mpi:
77
buildable: False
88
openmpi:
99
externals:
10-
- spec: [email protected]~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java+legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=ucx schedulers=slurm
10+
- spec: [email protected]~cuda~cxx~cxx_exceptions~java+lustre~memchecker+pmi~static~wrapper-rpath schedulers=slurm fabrics=ucx
11+
prefix: /contrib/spack-stack/installs/openmpi/4.1.6
1112
modules:
12-
- gnu/13.2.0
13+
- gnu/13.3.0
1314
- openmpi/4.1.6

‎configs/sites/tier1/hera/packages_intel.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@ packages:
3232
require::
3333
- '^openblas'
3434
# *DH
35-
zlib-ng:
36-
require:
37-
- '~shared'

‎configs/sites/tier1/hera/packages_oneapi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ packages:
3535
- '@1.26'
3636
- '^openblas'
3737
# *DH
38-
zlib-ng:
39-
require:
40-
- '~shared'
4138
cdo:
4239
require:
4340
- '@2.3.0'

‎configs/sites/tier1/hercules/compilers.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,18 @@ compilers:
3838
I_MPI_EXTRA_FILESYSTEM: 'ON'
3939
extra_rpaths: []
4040
- compiler:
41-
spec: gcc@12.2.0
41+
spec: gcc@13.3.0
4242
paths:
43-
cc: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gcc
44-
cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/g++
45-
f77: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gfortran
46-
fc: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gfortran
43+
cc: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/gcc
44+
cxx: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/g++
45+
f77: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/gfortran
46+
fc: /apps/contrib/spack-stack/gnu/installs/gnu/13.3.0/bin/gfortran
4747
flags: {}
4848
operating_system: rocky9
4949
target: x86_64
5050
modules:
51-
- gcc/12.2.0
52-
environment: {}
51+
- gnu/13.3.0
52+
environment:
53+
prepend_path:
54+
MODULEPATH: '/apps/contrib/spack-stack/modulefiles'
5355
extra_rpaths: []

‎configs/sites/tier1/hercules/packages.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
packages:
22
# For addressing https://github.com/JCSDA/spack-stack/issues/1355
3-
# Use system zlib instead of spack-built zlib-ng
3+
# Use system zlib instead of spack-built zlib-ng
44
all:
55
providers:
66
zlib-api:: [zlib]
@@ -9,9 +9,10 @@ packages:
99
zlib:
1010
buildable: False
1111
externals:
12-
- spec: [email protected]
13-
prefix: /usr
14-
12+
- spec: [email protected]
13+
prefix: /apps/spack-managed/gcc-11.3.1/zlib-1.2.13-ltp4c3zzde3zi3gf7x4b7c7nj5ww4i4g
14+
modules:
15+
- zlib/1.2.13
1516
autoconf:
1617
externals:
1718
- spec: [email protected]

‎configs/sites/tier1/hercules/packages_gcc.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
packages:
22
all:
3-
compiler:: [gcc@12.2.0]
3+
compiler:: [gcc@13.3.0]
44
providers:
5-
mpi:: [[email protected].4]
5+
mpi:: [[email protected].6]
66
mpi:
77
buildable: False
88
openmpi:
99
externals:
10-
- spec: [email protected].4%[email protected] ~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java~legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=none romio-filesystem=none schedulers=slurm
11-
prefix: /apps/spack-managed/gcc-12.2.0/openmpi-4.1.4-hf3dkf6r56x3klzcgs3u7esgt3fhnk63
10+
- spec: [email protected].6~atomics~cuda~cxx~cxx_exceptions~java+legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=ucx schedulers=slurm
11+
prefix: /apps/contrib/spack-stack/openmpi/installs/openmpi/4.1.6
1212
modules:
13-
- gcc/12.2.0
14-
- openmpi/4.1.4
13+
- gnu/13.3.0
14+
- openmpi/4.1.6
1515

1616
ectrans:
1717
require::
@@ -23,6 +23,3 @@ packages:
2323
require::
2424
- '@1.26'
2525
- '^openblas'
26-
zlib-ng:
27-
require:
28-
- '~shared'

0 commit comments

Comments
 (0)