Skip to content

Commit 7864f34

Browse files
climbfujiclimbfuji
committed
Update configs/common/modules_lmod.yaml and configs/common/modules_tcl.yaml: add -noopenmp suffices for esmf, ip, and neptune-env only
1 parent 0898cef commit 7864f34

File tree

2 files changed

+40
-26
lines changed

2 files changed

+40
-26
lines changed

‎configs/common/modules_lmod.yaml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ modules:
112112
suffixes:
113113
+debug: 'debug'
114114
build_type=Debug: 'debug'
115-
+openmp: 'openmp'
116115
ecmwf-atlas:
117116
environment:
118117
set:
@@ -121,6 +120,14 @@ modules:
121120
environment:
122121
set:
123122
'ESMFMKFILE': '{prefix}/lib/esmf.mk'
123+
suffixes:
124+
~openmp: 'noopenmp'
125+
ip:
126+
suffixes:
127+
~openmp: 'noopenmp'
128+
neptune-env:
129+
suffixes:
130+
~openmp: 'noopenmp'
124131
libpng:
125132
environment:
126133
set:
@@ -131,18 +138,18 @@ modules:
131138
'MADIS_ROOT': '{prefix}'
132139
mapl:
133140
suffixes:
134-
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.6.1'
135-
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.6.1-debug'
136-
^[email protected]~debug +openmp snapshot=none: 'esmf-8.6.1-openmp'
137-
^[email protected]+debug +openmp snapshot=none: 'esmf-8.6.1-debug-openmp'
138-
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.8.0'
139-
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.8.0-debug'
140-
^[email protected]~debug +openmp snapshot=none: 'esmf-8.8.0-openmp'
141-
^[email protected]+debug +openmp snapshot=none: 'esmf-8.8.0-debug-openmp'
142-
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.9.1'
143-
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.9.1-debug'
144-
^[email protected]~debug +openmp snapshot=none: 'esmf-8.9.1-openmp'
145-
^[email protected]+debug +openmp snapshot=none: 'esmf-8.9.1-debug-openmp'
141+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.6.1-noopenmp'
142+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.6.1-debug-noopenmp'
143+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.6.1'
144+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.6.1-debug'
145+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.8.0-noopenmp'
146+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.8.0-debug-noopenmp'
147+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.8.0'
148+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.8.0-debug'
149+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.9.1-noopenmp'
150+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.9.1-debug-noopenmp'
151+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.9.1'
152+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.9.1-debug'
146153
fms:
147154
suffixes:
148155
constants=GFS: 'gfs-constants'

‎configs/common/modules_tcl.yaml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ modules:
131131
suffixes:
132132
+debug: 'debug'
133133
build_type=Debug: 'debug'
134-
+openmp: 'openmp'
135134
ecmwf-atlas:
136135
environment:
137136
set:
@@ -140,6 +139,14 @@ modules:
140139
environment:
141140
set:
142141
'ESMFMKFILE': '{prefix}/lib/esmf.mk'
142+
suffixes:
143+
~openmp: 'noopenmp'
144+
ip:
145+
suffixes:
146+
~openmp: 'noopenmp'
147+
neptune-env:
148+
suffixes:
149+
~openmp: 'noopenmp'
143150
libpng:
144151
environment:
145152
set:
@@ -150,18 +157,18 @@ modules:
150157
'MADIS_ROOT': '{prefix}'
151158
mapl:
152159
suffixes:
153-
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.6.1'
154-
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.6.1-debug'
155-
^[email protected]~debug +openmp snapshot=none: 'esmf-8.6.1-openmp'
156-
^[email protected]+debug +openmp snapshot=none: 'esmf-8.6.1-debug-openmp'
157-
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.8.0'
158-
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.8.0-debug'
159-
^[email protected]~debug +openmp snapshot=none: 'esmf-8.8.0-openmp'
160-
^[email protected]+debug +openmp snapshot=none: 'esmf-8.8.0-debug-openmp'
161-
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.9.1'
162-
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.9.1-debug'
163-
^[email protected]~debug +openmp snapshot=none: 'esmf-8.9.1-openmp'
164-
^[email protected]+debug +openmp snapshot=none: 'esmf-8.9.1-debug-openmp'
160+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.6.1-noopenmp'
161+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.6.1-debug-noopenmp'
162+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.6.1'
163+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.6.1-debug'
164+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.8.0-noopenmp'
165+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.8.0-debug-noopenmp'
166+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.8.0'
167+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.8.0-debug'
168+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.9.1-noopenmp'
169+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.9.1-debug-noopenmp'
170+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.9.1'
171+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.9.1-debug'
165172
fms:
166173
suffixes:
167174
constants=GFS: 'gfs-constants'

0 commit comments

Comments
 (0)