Skip to content

Commit 9502082

Browse files
climbfujiclimbfuji
authored
Merge branch 'develop' into weekly_build
2 parents 5068f19 + 885db56 commit 9502082

File tree

26 files changed

+202
-319
lines changed

26 files changed

+202
-319
lines changed

‎configs/common/modules_lmod.yaml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,10 @@ modules:
112112
environment:
113113
set:
114114
'ESMFMKFILE': '{prefix}/lib/esmf.mk'
115-
hdf5:
116-
environment:
117-
set:
118-
'HDF5_DIR': '{prefix}'
119115
libpng:
120116
environment:
121117
set:
122118
'PNG_ROOT': '{prefix}'
123-
libyaml:
124-
environment:
125-
set:
126-
'YAML_DIR': '{prefix}'
127-
'YAML_LIB': '{prefix}/lib'
128-
'YAML_INC': '{prefix}/include'
129119
madis:
130120
environment:
131121
set:
@@ -146,17 +136,13 @@ modules:
146136
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
147137
^[email protected]~debug snapshot=b11: 'esmf-8.7.0b11'
148138
^[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'
149141
openmpi:
150142
environment:
151143
set:
152144
'OMPI_MCA_rmaps_base_oversubscribe': '1'
153145
'PRTE_MCA_rmaps_default_mapping_policy': ':oversubscribe'
154-
p4est:
155-
environment:
156-
set:
157-
'P4EST_API_DIR': '{prefix}'
158-
'P4EST_API_LIB': '{prefix}/lib'
159-
'P4EST_API_INC': '{prefix}/include'
160146
bacio:
161147
environment:
162148
set:

‎configs/common/modules_tcl.yaml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,10 @@ modules:
114114
environment:
115115
set:
116116
'ESMFMKFILE': '{prefix}/lib/esmf.mk'
117-
hdf5:
118-
environment:
119-
set:
120-
'HDF5_DIR': '{prefix}'
121117
libpng:
122118
environment:
123119
set:
124120
'PNG_ROOT': '{prefix}'
125-
libyaml:
126-
environment:
127-
set:
128-
'YAML_DIR': '{prefix}'
129-
'YAML_LIB': '{prefix}/lib'
130-
'YAML_INC': '{prefix}/include'
131121
madis:
132122
environment:
133123
set:
@@ -148,17 +138,13 @@ modules:
148138
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
149139
^[email protected]~debug snapshot=b11: 'esmf-8.7.0b11'
150140
^[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'
151143
openmpi:
152144
environment:
153145
set:
154146
'OMPI_MCA_rmaps_base_oversubscribe': '1'
155147
'PRTE_MCA_rmaps_default_mapping_policy': ':oversubscribe'
156-
p4est:
157-
environment:
158-
set:
159-
'P4EST_API_DIR': '{prefix}'
160-
'P4EST_API_LIB': '{prefix}/lib'
161-
'P4EST_API_INC': '{prefix}/include'
162148
bacio:
163149
environment:
164150
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

‎configs/sites/tier1/atlantis/packages_gcc.yaml‎

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+
mpi:: [[email protected]]
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
- spec: [email protected]
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+
spec: [email protected]
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
spec: [email protected]
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/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:///p/app/projects/NEPTUNE/spack-stack/source-cache
12+
url: file:///p/cwfs/projects/NEPTUNE/spack-stack/source-cache
1313
access_pair:
1414
- null
1515
- null

‎configs/sites/tier1/narwhal/packages_oneapi.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
packages:
2+
all:
3+
compiler:: [[email protected],[email protected]]
4+
providers:
5+
mpi:: [[email protected]]
6+
mpi:
7+
buildable: False
8+
cray-mpich:
9+
externals:
10+
- spec: [email protected]%[email protected] ~wrappers
11+
modules:
12+
- cray-mpich-ucx/8.1.21
13+
- craype-network-ucx
14+
intel-oneapi-mkl:
15+
externals:
16+
- spec: [email protected]%[email protected]
17+
prefix: /opt/intel/oneapi_2024.2.0.634
18+
intel-oneapi-tbb:
19+
externals:
20+
- spec: [email protected]%[email protected]
21+
prefix: /opt/intel/oneapi_2024.2.0.634
22+
modules:
23+
- tbb/2021.13
24+
intel-oneapi-runtime:
25+
externals:
26+
- spec: [email protected]%[email protected]
27+
prefix: /opt/intel/oneapi_2024.2.0.634

0 commit comments

Comments
 (0)