Skip to content

Commit 1c7a9e3

Browse files
authored
Update Derecho site config (#1726)
* Update configs/sites/tier1/derecho/* and doc/source/PreConfiguredSites.rst * Bug fix in configs/sites/tier1/derecho/packages_*.yaml: add missing cray-pals modules
1 parent 1fb30b5 commit 1c7a9e3

File tree

5 files changed

+39
-47
lines changed

5 files changed

+39
-47
lines changed

configs/sites/tier1/derecho/compilers.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,44 @@ 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'
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'
2020
set:
2121
# https://github.com/JCSDA/spack-stack/issues/957
2222
FI_CXI_RX_MATCH_MODE: 'hybrid'
2323
# https://github.com/JCSDA/spack-stack/issues/1012
2424
I_MPI_EXTRA_FILESYSTEM: 'ON'
2525
extra_rpaths: []
2626
- compiler:
27-
spec: gcc@12.2.0
27+
spec: gcc@12.4.0
2828
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
29+
cc: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gcc
30+
cxx: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/g++
31+
f77: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
32+
fc: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c/bin/gfortran
3333
flags: {}
3434
operating_system: sles15
3535
target: x86_64
3636
modules:
37-
- ncarenv/23.09
38-
- gcc/12.2.0
37+
- ncarenv/24.12
38+
- gcc/12.4.0
3939
environment:
4040
prepend_path:
4141
# 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'
42+
LD_LIBRARY_PATH: '/glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2/lib'
4343
set:
4444
# https://github.com/JCSDA/spack-stack/issues/957
4545
FI_CXI_RX_MATCH_MODE: 'hybrid'

configs/sites/tier1/derecho/packages.yaml

Lines changed: 7 additions & 10 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
@@ -107,6 +101,9 @@ packages:
107101
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: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
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-
10+
11+
prefix: /opt/cray/pe/mpich/8.1.29/ofi/gnu/12.3
1112
modules:
12-
- craype/2.7.20
13-
- cray-mpich/8.1.27
13+
- ncarenv/24.12
14+
- craype/2.7.31
15+
- cray-mpich/8.1.29
1416
- libfabric/1.15.2.0
1517
- cray-pals/1.2.11
18+
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
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:
77
buildable: False
88
cray-mpich:
99
externals:
10-
10+
11+
prefix: /opt/cray/pe/mpich/8.1.29/ofi/intel/2022.1
1112
modules:
12-
- craype/2.7.20
13+
- ncarenv/24.12
14+
- craype/2.7.31
1315
- cray-mpich/8.1.29
1416
- libfabric/1.15.2.0
1517
- cray-pals/1.2.11
1618
intel-oneapi-runtime:
1719
buildable: False
1820
externals:
1921
20-
prefix: /glade/u/apps/common/23.08/spack/opt/spack/intel-oneapi-compilers/2024.2.1
21-
intel-oneapi-mkl:
22-
# No intel-oneapi-mkl installed on Derecho, install via spack.
23-
# Prefer the version that Intel releases with the above compiler
24-
prefer:
25-
- '@2024.2'
22+
prefix: /glade/u/apps/casper/24.12/spack/opt/spack/intel-oneapi-compilers/2024.2.1/gcc/12.4.0/iq3b/compiler/2024.2

doc/source/PreConfiguredSites.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,7 @@ The following is required for building new spack environments with any supported
206206

207207
.. code-block:: console
208208
209-
module purge
210-
# ignore that the sticky module ncarenv/... is not unloaded
211-
export LMOD_TMOD_FIND_FIRST=yes
212-
module load ncarenv/23.09
213-
module use /glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles
214-
209+
module --force purge
215210
216211
.. _Preconfigured_Sites_Acorn:
217212

0 commit comments

Comments
 (0)