Skip to content

Commit ae5e7ae

Browse files
authored
Move jet from tier1 to tier2 and update it (#1721)
1 parent dd6093d commit ae5e7ae

File tree

11 files changed

+159
-80
lines changed

11 files changed

+159
-80
lines changed

configs/sites/tier1/jet/compilers.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

configs/sites/tier1/jet/packages_gcc.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

configs/sites/tier1/jet/packages_intel.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
compilers:
2+
- compiler:
3+
4+
paths:
5+
cc: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/icc
6+
cxx: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/icpc
7+
f77: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort
8+
fc: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort
9+
flags: {}
10+
operating_system: rocky8
11+
modules:
12+
- intel/2022.1.2
13+
environment:
14+
prepend_path:
15+
PATH: '/apps/gnu/gcc-9.2.0/bin'
16+
LD_LIBRARY_PATH: '/apps/gnu/gcc-9.2.0/lib64'
17+
CPATH: '/apps/gnu/gcc-9.2.0/include'
18+
extra_rpaths: []
19+
- compiler:
20+
21+
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
26+
flags: {}
27+
operating_system: rocky8
28+
modules:
29+
- gnu/13.2.0
30+
environment: {}
31+
extra_rpaths: []
32+
- compiler:
33+
34+
paths:
35+
cc: /apps/oneapi/compiler/2024.2/bin/icx
36+
cxx: /apps/oneapi/compiler/2024.2/bin/icpx
37+
f77: /apps/oneapi/compiler/2024.2/bin/ifort
38+
fc: /apps/oneapi/compiler/2024.2/bin/ifort
39+
flags: {}
40+
operating_system: rocky8
41+
modules:
42+
- intel/2024.2.1
43+
environment:
44+
prepend_path:
45+
PATH: '/apps/gnu/gcc-13.2.0/bin'
46+
LD_LIBRARY_PATH: '/apps/gnu/gcc-13.2.0/lib64'
47+
CPATH: '/apps/gnu/gcc-13.2.0/include'
48+
extra_rpaths: []

configs/sites/tier1/jet/mirrors.yaml renamed to configs/sites/tier2/jet/mirrors.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
mirrors:
22
local-source:
33
fetch:
4-
url: file:///mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/source-cache
4+
url: file:///contrib/spack-stack/source-cache
55
access_pair:
66
- null
77
- null
88
access_token: null
99
profile: null
1010
endpoint_url: null
1111
push:
12-
url: file:///mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/source-cache
12+
url: file:///lfs6/BMC/nrtrr/spack-stack/source-cache
1313
access_pair:
1414
- null
1515
- null

configs/sites/tier1/jet/packages.yaml renamed to configs/sites/tier2/jet/packages.yaml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ packages:
4242
externals:
4343
4444
prefix: /usr
45-
flex:
46-
externals:
47-
- spec: [email protected]+lex
48-
prefix: /usr
4945
gawk:
5046
externals:
5147
@@ -66,10 +62,6 @@ packages:
6662
externals:
6763
6864
prefix: /usr
69-
go:
70-
externals:
71-
72-
prefix: /usr
7365
grep:
7466
externals:
7567
@@ -84,7 +76,7 @@ packages:
8476
prefix: /usr
8577
openjdk:
8678
externals:
87-
- spec: [email protected].0_322-b06
79+
- spec: [email protected].0_312-b07
8880
prefix: /usr
8981
krb5:
9082
externals:
@@ -97,10 +89,10 @@ packages:
9789
libxpm:
9890
externals:
9991
100-
prefix: usr/
92+
prefix: /usr
10193
lustre:
10294
externals:
103-
- spec: lustre@2.12.6_ddn62
95+
- spec: lustre@2.14.0_ddn168
10496
prefix: /usr
10597
m4:
10698
externals:
@@ -110,9 +102,13 @@ packages:
110102
buildable: False
111103
externals:
112104
113-
prefix: /lfs4/HFIP/hfv3gfs/role.epic/apps/mysql-8.0.31
105+
prefix: /contrib/spack-stack/installs/mysql-8.0.31
114106
modules:
115107
- mysql/8.0.31
108+
ncurses:
109+
externals:
110+
- spec: [email protected]+termlib abi=5
111+
prefix: /usr
116112
perl:
117113
externals:
118114
- spec: [email protected]~cpanm+shared+threads
@@ -122,7 +118,6 @@ packages:
122118
123119
prefix: /usr
124120
qt:
125-
buildable: false
126121
externals:
127122
128123
prefix: /contrib/spack-stack/installs/qt-5.12.6/qtbase
@@ -146,10 +141,18 @@ packages:
146141
externals:
147142
148143
prefix: /usr
144+
texlive:
145+
externals:
146+
- spec: texlive@20130530
147+
prefix: /usr
149148
wget:
150149
externals:
151150
152151
prefix: /usr
152+
xz:
153+
externals:
154+
155+
prefix: /usr
153156
zip:
154157
externals:
155158
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
packages:
2+
all:
3+
compiler:: [[email protected]]
4+
providers:
5+
6+
mpi:
7+
buildable: False
8+
openmpi:
9+
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
11+
modules:
12+
- gnu/13.2.0
13+
- openmpi/4.1.6
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
packages:
2+
all:
3+
4+
providers:
5+
6+
# Remove the next three lines to switch to intel-oneapi-mkl
7+
blas:: [openblas]
8+
fftw-api:: [fftw]
9+
lapack:: [openblas]
10+
mpi:
11+
buildable: False
12+
intel-oneapi-mpi:
13+
externals:
14+
- spec: [email protected]%[email protected] +classic-names
15+
modules:
16+
- impi/2022.1.2
17+
prefix: /apps/oneapi
18+
intel-oneapi-mkl:
19+
# Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
20+
buildable: False
21+
#externals:
22+
23+
# prefix: /apps/oneapi
24+
# DH* Remove this section to switch to intel-oneapi-mkl
25+
ectrans:
26+
require::
27+
- '@1.2.0 ~mkl +fftw'
28+
gsibec:
29+
require::
30+
- '@1.2.1 ~mkl'
31+
py-numpy:
32+
require::
33+
- '^openblas'
34+
# *DH
35+
zlib-ng:
36+
require:
37+
- '~shared'

0 commit comments

Comments
 (0)