Skip to content

Commit 55967c1

Browse files
authored
Add oneAPI config for Narwhal, add GNU config for Atlantis, remove Sandy platform; make python variant for esmf configurable (#1318)
- Add a [email protected] config for Narwhal (using icx, icpx, ifort) - Add a [email protected] config for Atlantis - Remove Sandy as a supported platform - Update submodule pointer for spack to bring in [email protected] (official release) and replace [email protected] with [email protected] in all configs/** - Make python variant for esmf configurable
1 parent 7538aa0 commit 55967c1

File tree

22 files changed

+127
-167
lines changed

22 files changed

+127
-167
lines changed

configs/common/modules_lmod.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ modules:
136136
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
137137
^[email protected]~debug snapshot=b11: 'esmf-8.7.0b11'
138138
^[email protected]+debug snapshot=b11: 'esmf-8.7.0b11-debug'
139+
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
140+
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
139141
openmpi:
140142
environment:
141143
set:

configs/common/modules_tcl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ modules:
138138
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
139139
^[email protected]~debug snapshot=b11: 'esmf-8.7.0b11'
140140
^[email protected]+debug snapshot=b11: 'esmf-8.7.0b11-debug'
141+
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
142+
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
141143
openmpi:
142144
environment:
143145
set:

configs/common/packages

Whitespace-only changes.

configs/common/packages.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,19 @@ packages:
5454
# Also, check the acorn and derecho site configs which have esmf modifications.
5555
esmf:
5656
require:
57-
- '~xerces ~pnetcdf +shared +external-parallelio +python'
58-
- any_of: ['@=8.6.1 snapshot=none', '@=8.7.0b11 snapshot=b11']
59-
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
60-
when: "%intel"
61-
message: "Extra ESMF compile options for Intel"
62-
#- any_of: ['']
63-
# when: "%gcc"
64-
# message: "Extra ESMF compile options for GCC"
65-
#- any_of: ['']
66-
# when: "%apple-clang"
67-
# message: "Extra ESMF compile options for GCC"
57+
- '~xerces ~pnetcdf +shared +external-parallelio'
58+
- any_of: ['@=8.6.1 snapshot=none', '@=8.7.0 snapshot=none']
59+
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
60+
when: "%intel"
61+
message: "Extra ESMF compile options for Intel"
62+
#- any_of: ['']
63+
# when: "%gcc"
64+
# message: "Extra ESMF compile options for GCC"
65+
#- any_of: ['']
66+
# when: "%apple-clang"
67+
# message: "Extra ESMF compile options for GCC"
68+
prefer:
69+
- '+python'
6870
fckit:
6971
require: '@0.11.0 +eckit'
7072
fftw:

configs/sites/tier1/sandy/mirrors.yaml renamed to configs/sites/tier1/atlantis/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:///gpfs/fs1/neptune/spack-stack/source-cache
4+
url: file:///neptune_diagnostics/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:///gpfs/fs1/neptune/spack-stack/source-cache
12+
url: file:///neptune_diagnostics/spack-stack/source-cache/
1313
access_pair:
1414
- null
1515
- null
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+
buildable: False
10+
externals:
11+
- spec: [email protected]%gcc@=11.2.0~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath fabrics=ucx schedulers=slurm
12+
modules:
13+
- openmpi/mlnx/gcc/64/4.1.5a1

configs/sites/tier1/atlantis/packages_intel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ packages:
1515
intel-oneapi-mkl:
1616
externals:
1717
18+
prefix: /cm/shared/apps/intel/oneapi
1819
modules:
1920
- mkl/2022.1.0
20-
prefix: /cm/shared/apps/intel/oneapi

configs/sites/tier1/narwhal/compilers.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,30 @@ compilers::
2121
set:
2222
CRAYPE_LINK_TYPE: 'dynamic'
2323
extra_rpaths: []
24+
- compiler:
25+
26+
paths:
27+
cc: cc
28+
cxx: CC
29+
f77: ftn
30+
fc: ftn
31+
flags: {}
32+
operating_system: sles15
33+
modules:
34+
- PrgEnv-intel/8.4.0
35+
- intel/2024.2
36+
- cray-libsci/23.05.1.4
37+
- libfabric/1.12.1.2.2.1
38+
environment:
39+
prepend_path:
40+
PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'
41+
CPATH: '/opt/cray/pe/gcc/10.3.0/snos/include'
42+
LD_LIBRARY_PATH: '/opt/cray/libfabric/1.12.1.2.2.1/lib64:/opt/cray/pe/libsci/23.05.1.4/INTEL/2022.2/x86_64/lib:/opt/cray/pe/gcc/10.3.0/snos/lib:/opt/cray/pe/gcc/10.3.0/snos/lib64'
43+
append_path:
44+
CPATH: '/opt/intel/oneapi_2024.2.0.634/compiler/2024.2/opt/compiler/include/intel64'
45+
set:
46+
CRAYPE_LINK_TYPE: 'dynamic'
47+
extra_rpaths: []
2448
- compiler:
2549
2650
paths:

configs/sites/tier1/narwhal/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:///p/app/projects/NEPTUNE/spack-stack/source-cache
4+
url: file:///p/cwfs/projects/NEPTUNE/spack-stack/build-cache
55
access_pair:
66
- null
77
- null
88
access_token: null
99
profile: null
1010
endpoint_url: null
1111
push:
12-
url: file:///p/app/projects/NEPTUNE/spack-stack/source-cache
12+
url: file:///p/cwfs/projects/NEPTUNE/spack-stack/build-cache
1313
access_pair:
1414
- null
1515
- null
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
packages:
2+
all:
3+
4+
providers:
5+
6+
mpi:
7+
buildable: False
8+
cray-mpich:
9+
externals:
10+
11+
modules:
12+
- cray-mpich-ucx/8.1.21
13+
- craype-network-ucx
14+
intel-oneapi-mkl:
15+
externals:
16+
17+
prefix: /opt/intel/oneapi_2024.2.0.634
18+
intel-oneapi-tbb:
19+
externals:
20+
21+
prefix: /opt/intel/oneapi_2024.2.0.634
22+
modules:
23+
- tbb/2021.13
24+
intel-oneapi-runtime:
25+
externals:
26+
27+
prefix: /opt/intel/oneapi_2024.2.0.634

0 commit comments

Comments
 (0)