Skip to content

Commit 02bfd2a

Browse files
committed
Merge branch 'release/1.9.0' of https://github.com/jcsda/spack-stack into feature/rel193_final_touches
2 parents 5e1ef10 + b9fc93e commit 02bfd2a

20 files changed

+406
-325
lines changed

configs/sites/tier1/derecho/compilers.yaml

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,32 @@ compilers::
22
- compiler:
33
44
paths:
5-
cc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2024.2.1/compiler/2024.2/bin/icx
6-
cxx: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2024.2.1/compiler/2024.2/bin/icpx
7-
f77: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2024.2.1/compiler/2024.2/bin/ifort
8-
fc: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2024.2.1/compiler/2024.2/bin/ifort
5+
cc: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/icx
6+
cxx: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/icpx
7+
f77: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/ifort
8+
fc: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/bin/ifort
99
flags: {}
1010
operating_system: sles15
1111
target: x86_64
1212
modules:
13-
- ncarenv/23.09
14-
- intel-oneapi/2024.2.1
13+
- ncarenv/24.12
14+
- intel/2024.2.1
1515
environment:
1616
prepend_path:
17-
PATH: '/opt/cray/pe/gcc/12.2.0/snos/bin'
18-
CPATH: '/opt/cray/pe/gcc/12.2.0/snos/include'
19-
LD_LIBRARY_PATH: '/opt/cray/pe/gcc/12.2.0/snos/lib:/opt/cray/pe/gcc/12.2.0/snos/lib64'
20-
set:
21-
# https://github.com/JCSDA/spack-stack/issues/957
22-
FI_CXI_RX_MATCH_MODE: 'hybrid'
23-
# https://github.com/JCSDA/spack-stack/issues/1012
24-
I_MPI_EXTRA_FILESYSTEM: 'ON'
25-
extra_rpaths: []
17+
PATH: '/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin'
18+
CPATH: '/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/include'
19+
LD_LIBRARY_PATH: '/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/lib:/glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/lib64'
20+
2621
- compiler:
27-
spec: gcc@12.2.0
22+
spec: gcc@12.4.0
2823
paths:
29-
cc: /opt/cray/pe/gcc/12.2.0/bin/gcc
30-
cxx: /opt/cray/pe/gcc/12.2.0/bin/g++
31-
f77: /opt/cray/pe/gcc/12.2.0/bin/gfortran
32-
fc: /opt/cray/pe/gcc/12.2.0/bin/gfortran
24+
cc: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gcc
25+
cxx: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/g++
26+
f77: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
27+
fc: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
3328
flags: {}
3429
operating_system: sles15
3530
target: x86_64
3631
modules:
37-
- ncarenv/23.09
38-
- gcc/12.2.0
39-
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'
43-
set:
44-
# https://github.com/JCSDA/spack-stack/issues/957
45-
FI_CXI_RX_MATCH_MODE: 'hybrid'
46-
extra_rpaths: []
32+
- ncarenv/24.12
33+
- gcc/12.4.0

configs/sites/tier1/derecho/modules.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ modules:
44
- lmod
55
lmod:
66
include:
7-
- cray-mpich
87
- python

configs/sites/tier1/derecho/packages.yaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ packages:
3434
externals:
3535
3636
prefix: /usr
37-
curl:
38-
externals:
39-
- spec: [email protected]+gssapi+ldap+nghttp2
40-
prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/curl/8.1.2/gcc/7.5.0/uq6y
4137
cvs:
4238
externals:
4339
@@ -56,14 +52,12 @@ packages:
5652
prefix: /usr
5753
git:
5854
externals:
59-
- spec: [email protected]+tcltk
60-
prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/git/2.41.0/gcc/7.5.0/jgni
61-
- spec: [email protected]+tcltk
62-
prefix: /usr
55+
56+
prefix: /glade/u/apps/casper/24.12/spack/opt/spack/git/2.47.0/gcc/12.4.0/cn62
6357
git-lfs:
6458
externals:
65-
- spec: git-lfs@3.3.0
66-
prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/git-lfs/3.3.0/gcc/7.5.0/u3kh
59+
- spec: git-lfs@3.5.1
60+
prefix: /glade/u/apps/casper/24.12/spack/opt/spack/git-lfs/3.5.1/gcc/12.4.0/aivb
6761
gmake:
6862
externals:
6963
@@ -85,17 +79,17 @@ packages:
8579
8680
prefix: /usr
8781
mysql:
88-
buildable: False
82+
buildable: false
8983
externals:
9084
9185
prefix: /glade/work/epicufsrt/contrib/spack-stack/derecho/mysql-8.0.33
9286
openssh:
9387
externals:
9488
9589
prefix: /usr
96-
# spack concretizer gets confused when omitting %gcc from the external spec (a spack bug?)
90+
# spack concretizer gets confused when omitting %gcc from the external spec (a spack bug?)
9791
openssl:
98-
buildable: False
92+
buildable: false
9993
externals:
10094
- spec: [email protected]%gcc
10195
prefix: /usr
@@ -104,9 +98,12 @@ packages:
10498
10599
prefix: /usr
106100
qt:
107-
buildable: False
101+
buildable: false
108102
externals:
109103
104+
# Newer versions don't work, some headers are missing
105+
#prefix: /glade/u/apps/casper/24.12/spack/opt/spack/qt/5.14.2/gcc/12.4.0/6suc
106+
#prefix: /glade/u/apps/casper/24.12/spack/opt/spack/qt/5.14.2/gcc/12.4.0/axtw
110107
prefix: /glade/u/apps/derecho/23.09/spack/opt/spack/qt/5.14.2/gcc/7.5.0/eqcj
111108
sed:
112109
externals:
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
packages:
22
all:
3-
compiler:: [gcc@12.2.0]
3+
compiler:: [gcc@12.4.0]
44
providers:
5-
mpi:: [[email protected].27]
5+
mpi:: [[email protected].29]
66
mpi:
77
buildable: False
88
cray-mpich:
99
externals:
10-
- spec: [email protected].27%gcc@12.2.0 +wrappers
10+
- spec: [email protected].29%gcc@12.4.0 +wrappers
1111
modules:
12-
- craype/2.7.20
13-
- cray-mpich/8.1.27
12+
- craype/2.7.31
13+
- ncarenv/24.12
14+
- gcc/12.4.0
1415
- libfabric/1.15.2.0
15-
- cray-pals/1.2.11
16+
- cray-mpich/8.1.29

configs/sites/tier1/derecho/packages_oneapi.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
packages:
22
all:
3-
compiler:: [[email protected], gcc@12.2.0]
3+
compiler:: [[email protected], gcc@12.4.0]
44
providers:
55
66
mpi:
7-
buildable: False
7+
buildable: false
88
cray-mpich:
99
externals:
1010
1111
modules:
12-
- craype/2.7.20
13-
- cray-mpich/8.1.29
12+
- ncarenv/24.12
13+
- craype/2.7.31
14+
- intel/2024.2.1
1415
- libfabric/1.15.2.0
15-
- cray-pals/1.2.11
16+
- cray-mpich/8.1.29
1617
intel-oneapi-runtime:
1718
buildable: False
1819
externals:
1920
20-
prefix: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2024.2.1
21+
prefix: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2
2122
intel-oneapi-mkl:
2223
# No intel-oneapi-mkl installed on Derecho, install via spack.
2324
# Prefer the version that Intel releases with the above compiler

configs/sites/tier1/discover-scu16/compilers.yaml

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

configs/sites/tier1/discover-scu16/modules.yaml

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

0 commit comments

Comments
 (0)