Skip to content

Commit f4b9b40

Browse files
climbfujiclimbfuji
authored
Add support for jean and wheat (tier 2); bug fix in setup-meta-modules extension; update doc/source/PreConfiguredSites.rst (#1687)
* Add configs/sites/tier2/jean * Add configs/sites/tier2/wheat * Bug fix in spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py to parse external specs like 'intel-oneapi-mpi@2021.3.0 generic_names=true %gcc@10.2.0 * Update doc/source/PreConfiguredSites.rst for Jean and Wheat
1 parent da08c9e commit f4b9b40

14 files changed

Lines changed: 435 additions & 4 deletions

File tree

‎configs/sites/tier2/jean/compilers.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
compilers::
2+
- compiler:
3+
spec: oneapi@=2024.2.1
4+
paths:
5+
cc: /p/work1/heinzell/oneapi-2024.2.1/compiler/2024.2/bin/icx
6+
cxx: /p/work1/heinzell/oneapi-2024.2.1/compiler/2024.2/bin/icpx
7+
f77: /p/work1/heinzell/oneapi-2024.2.1/compiler/2024.2/bin/ifort
8+
fc: /p/work1/heinzell/oneapi-2024.2.1/compiler/2024.2/bin/ifort
9+
flags: {}
10+
operating_system: rhel8
11+
target: x86_64
12+
modules:
13+
- Master
14+
- tbb/2021.13
15+
- compiler-rt/2024.2.1
16+
- compiler/2024.2.1
17+
- ifort/2024.2.1
18+
environment:
19+
prepend_path:
20+
PATH: '/p/app/compilers/gcc/10.2.0/bin'
21+
CPATH: '/p/app/compilers/gcc/10.2.0/include'
22+
LD_LIBRARY_PATH: '/p/app/compilers/gcc/10.2.0/lib:/p/app/compilers/gcc/10.2.0/lib64'
23+
MODULEPATH: /p/work1/heinzell/oneapi-2024.2.1/modulefiles
24+
extra_rpaths: []
25+
- compiler:
26+
spec: gcc@=10.2.0
27+
paths:
28+
cc: /p/app/compilers/gcc/10.2.0/bin/gcc
29+
cxx: /p/app/compilers/gcc/10.2.0/bin/g++
30+
f77: /p/app/compilers/gcc/10.2.0/bin/gfortran
31+
fc: /p/app/compilers/gcc/10.2.0/bin/gfortran
32+
flags: {}
33+
operating_system: rhel8
34+
target: x86_64
35+
modules:
36+
- Master
37+
- prgenv-gnu-intelmpi/10.2.0-2021.3.0
38+
environment: {}
39+
extra_rpaths: []

‎configs/sites/tier2/jean/config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
config:
2+
build_jobs: 8

‎configs/sites/tier2/jean/mirrors.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mirrors:
2+
# DH* 20250616 TEMPORARY PATHS!
3+
local-source: file:///p/work1/heinzell/spst-jean/source-cache
4+
local-binary: file:///p/work1/heinzell/spst-jean/build-cache

‎configs/sites/tier2/jean/modules.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
modules:
2+
default:
3+
enable::
4+
- tcl
5+
tcl:
6+
include:
7+
# List of packages for which we need modules that are blacklisted by default
8+
- python

‎configs/sites/tier2/jean/packages.yaml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
packages:
2+
# Modification of common packages
3+
# Use system zlib instead of spack-built zlib-ng
4+
all:
5+
providers:
6+
zlib-api:: [zlib]
7+
zlib-api:
8+
buildable: False
9+
zlib:
10+
buildable: False
11+
externals:
12+
- spec: zlib@1.2.11
13+
prefix: /usr
14+
15+
# All other packages listed alphabetically
16+
autoconf:
17+
externals:
18+
- spec: autoconf@2.69
19+
prefix: /usr
20+
automake:
21+
externals:
22+
- spec: automake@1.16.1
23+
prefix: /usr
24+
binutils:
25+
externals:
26+
- spec: binutils@2.30.125~gold~headers
27+
prefix: /usr
28+
#bison:
29+
# externals:
30+
# - spec: bison@3.0.4
31+
# prefix: /usr
32+
coreutils:
33+
externals:
34+
- spec: coreutils@8.30
35+
prefix: /usr
36+
#curl:
37+
# externals:
38+
# - spec: curl@7.61.1+gssapi+ldap+nghttp2
39+
# prefix: /usr
40+
diffutils:
41+
externals:
42+
- spec: diffutils@3.6
43+
prefix: /usr
44+
findutils:
45+
externals:
46+
- spec: findutils@4.6.0
47+
prefix: /usr
48+
flex:
49+
externals:
50+
- spec: flex@2.6.1+lex
51+
prefix: /usr
52+
gawk:
53+
externals:
54+
- spec: gawk@4.2.1
55+
prefix: /usr
56+
gettext:
57+
externals:
58+
- spec: gettext@0.19.8.1
59+
prefix: /usr
60+
git:
61+
externals:
62+
- spec: git@2.43.5~tcltk
63+
prefix: /usr
64+
# DH* external git-lfs missing
65+
groff:
66+
externals:
67+
- spec: groff@1.22.3
68+
prefix: /usr
69+
gmake:
70+
externals:
71+
- spec: gmake@4.2.1
72+
prefix: /usr
73+
libtool:
74+
externals:
75+
- spec: libtool@2.4.6
76+
prefix: /usr
77+
m4:
78+
externals:
79+
- spec: m4@1.4.18
80+
prefix: /usr
81+
openssh:
82+
externals:
83+
- spec: openssh@8.0p1
84+
prefix: /usr
85+
#- spec: openssh@10.0p2a
86+
# prefix: /usr/local/krb5
87+
#openssl:
88+
# externals:
89+
# - spec: openssl@1.1.1k
90+
# prefix: /usr
91+
#perl:
92+
# externals:
93+
# - spec: perl@5.26.3~cpanm+opcode+open+shared+threads
94+
# prefix: /usr
95+
pkgconf:
96+
externals:
97+
- spec: pkgconf@1.4.2
98+
prefix: /usr
99+
# DH* external qt5 missing
100+
sed:
101+
externals:
102+
- spec: sed@4.5
103+
prefix: /usr
104+
tar:
105+
externals:
106+
- spec: tar@1.30
107+
prefix: /usr

‎configs/sites/tier2/jean/packages_oneapi.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
packages:
2+
all:
3+
compiler:: [oneapi@2024.2.1, gcc@10.2.0]
4+
providers:
5+
mpi:: [intel-oneapi-mpi@2021.13]
6+
mpi:
7+
buildable: False
8+
intel-oneapi-mpi:
9+
externals:
10+
- spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
11+
prefix: /p/work1/heinzell/oneapi-2024.2.1
12+
modules:
13+
- mpi/2021.13
14+
intel-oneapi-mkl:
15+
externals:
16+
- spec: intel-oneapi-mkl@2024.2%oneapi@2024.2.1
17+
prefix: /p/work1/heinzell/oneapi-2024.2.1
18+
intel-oneapi-tbb:
19+
externals:
20+
- spec: intel-oneapi-tbb@2021.13%oneapi@2024.2.1
21+
prefix: /p/work1/heinzell/oneapi-2024.2.1
22+
intel-oneapi-runtime:
23+
externals:
24+
- spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
25+
prefix: /p/work1/heinzell/oneapi-2024.2.1

‎configs/sites/tier2/wheat/compilers.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
compilers::
2+
- compiler:
3+
spec: oneapi@=2024.2.1
4+
paths:
5+
cc: /p/global/Projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/icx
6+
cxx: /p/global/Projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/icpx
7+
f77: /p/global/Projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/ifort
8+
fc: /p/global/Projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/ifort
9+
flags: {}
10+
operating_system: rhel8
11+
target: x86_64
12+
modules:
13+
#- gcc/10.3.1
14+
- tbb/2021.13
15+
- compiler-rt/2024.2.1
16+
- compiler/2024.2.1
17+
- ifort/2024.2.1
18+
environment:
19+
prepend_path:
20+
PATH: /opt/rh/gcc-toolset-10/root/usr/bin
21+
CPATH: /opt/rh/gcc-toolset-10/root/usr/include
22+
LD_LIBRARY_PATH: /opt/rh/gcc-toolset-10/root/usr/lib:/opt/rh/gcc-toolset-10/root/usr/lib64
23+
MODULEPATH: /p/global/Projects/NEPTUNE/spack-stack/oneapi-2024.2.1/modulefiles
24+
extra_rpaths: []
25+
# Cannot use as preferred compiler: see PR description for Nautilus
26+
# in https://github.com/JCSDA/spack-stack/pull/1449
27+
#- compiler:
28+
# spec: gcc@=12.2.1
29+
# paths:
30+
# cc: /opt/rh/gcc-toolset-12/root/usr/bin/gcc
31+
# cxx: /opt/rh/gcc-toolset-12/root/usr/bin/g++
32+
# f77: /opt/rh/gcc-toolset-12/root/usr/bin/gfortran
33+
# fc: /opt/rh/gcc-toolset-12/root/usr/bin/gfortran
34+
# flags: {}
35+
# operating_system: rhel8
36+
# target: x86_64
37+
# modules:
38+
# - gcc/12.2.1
39+
# environment: {}
40+
# extra_rpaths: []
41+
- compiler:
42+
spec: gcc@=10.3.1
43+
paths:
44+
cc: /opt/rh/gcc-toolset-10/root/usr/bin/gcc
45+
cxx: /opt/rh/gcc-toolset-10/root/usr/bin/g++
46+
f77: /opt/rh/gcc-toolset-10/root/usr/bin/gfortran
47+
fc: /opt/rh/gcc-toolset-10/root/usr/bin/gfortran
48+
flags: {}
49+
operating_system: rhel8
50+
target: x86_64
51+
modules:
52+
- gcc/10.3.1
53+
environment: {}
54+
extra_rpaths: []

‎configs/sites/tier2/wheat/config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
config:
2+
build_jobs: 8

‎configs/sites/tier2/wheat/mirrors.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mirrors:
2+
local-source: file:///p/global/Projects/NEPTUNE/spack-stack/source-cache
3+
local-binary: file:///p/global/Projects/NEPTUNE/spack-stack/build-cache

‎configs/sites/tier2/wheat/modules.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
modules:
2+
default:
3+
enable::
4+
- tcl
5+
tcl:
6+
include:
7+
# List of packages for which we need modules that are blacklisted by default
8+
- python

0 commit comments

Comments
 (0)