Skip to content

Commit 4e3e80a

Browse files
victorusuvictorusu
committed
Revert builtin modules changes to kesch et.al
1 parent f468b0f commit 4e3e80a

File tree

5 files changed

+17
-23
lines changed

5 files changed

+17
-23
lines changed

‎config/cscs.py‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -279,17 +279,15 @@ class ReframeSettings:
279279
'scheduler': 'local',
280280
'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi',
281281
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
282-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
283-
'builtin'],
282+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
284283
'descr': 'Kesch login nodes',
285284
},
286285
'pn': {
287286
'scheduler': 'nativeslurm',
288287
'access': ['--partition=pn-regression'],
289288
'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi',
290289
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
291-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
292-
'builtin'],
290+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
293291
'descr': 'Kesch post-processing nodes'
294292
},
295293

@@ -298,8 +296,7 @@ class ReframeSettings:
298296
'access': ['--partition=cn-regression'],
299297
'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi',
300298
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
301-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
302-
'builtin'],
299+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
303300
'descr': 'Kesch compute nodes',
304301
'resources': {
305302
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'],
@@ -317,24 +314,21 @@ class ReframeSettings:
317314
'login': {
318315
'scheduler': 'local',
319316
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
320-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
321-
'builtin'],
317+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
322318
'descr': 'Arolla login nodes',
323319
},
324320
'pn': {
325321
'scheduler': 'nativeslurm',
326322
'access': ['--partition=pn-regression'],
327323
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
328-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
329-
'builtin'],
324+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
330325
'descr': 'Arolla post-processing nodes',
331326
},
332327
'cn': {
333328
'scheduler': 'nativeslurm',
334329
'access': ['--partition=cn-regression'],
335330
'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi',
336-
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
337-
'builtin'],
331+
'PrgEnv-pgi', 'PrgEnv-pgi-nompi'],
338332
'descr': 'Arolla compute nodes',
339333
'resources': {
340334
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'],
@@ -352,24 +346,21 @@ class ReframeSettings:
352346
'login': {
353347
'scheduler': 'local',
354348
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
355-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
356-
'builtin'],
349+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
357350
'descr': 'Tsa login nodes',
358351
},
359352
'pn': {
360353
'scheduler': 'nativeslurm',
361354
'access': ['--partition=pn-regression'],
362355
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
363-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
364-
'builtin'],
356+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
365357
'descr': 'Tsa post-processing nodes',
366358
},
367359
'cn': {
368360
'scheduler': 'nativeslurm',
369361
'access': ['--partition=cn-regression'],
370362
'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi',
371-
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
372-
'builtin'],
363+
'PrgEnv-pgi', 'PrgEnv-pgi-nompi'],
373364
'descr': 'Tsa compute nodes',
374365
'resources': {
375366
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'],

‎cscs-checks/libraries/io/netcdf_compile_run.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ def __init__(self, lang, linkage):
3232
elif self.current_system.name == 'kesch':
3333
self.exclusive_access = True
3434
if linkage == 'dynamic':
35-
self.valid_prog_environs = ['builtin']
35+
self.valid_prog_environs = ['PrgEnv-pgi-nompi']
3636

3737
if lang != 'f90':
38-
self.valid_prog_environs += ['builtin']
38+
self.valid_prog_environs += ['PrgEnv-cray-nompi']
3939
elif self.current_system.name in ['arolla', 'tsa']:
4040
self.exclusive_access = True
4141
self.valid_prog_environs = ['PrgEnv-gnu-nompi', 'PrgEnv-pgi-nompi']

‎cscs-checks/mch/fieldextra_check.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def __init__(self):
1515
self.tags = {'mch', 'external-resources'}
1616

1717
self.valid_systems = ['kesch:cn']
18-
self.valid_prog_environs = ['builtin']
18+
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
1919
self.executable = 'cookbook/run.bash'
2020

2121
self.num_tasks = 1

‎cscs-checks/tools/io/cdo.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,17 @@ def __init__(self):
3535
'CDO-NCO')
3636
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
3737
'kesch:pn', 'arolla:pn', 'tsa:pn']
38-
self.valid_prog_environs = ['builtin']
3938
if self.current_system.name == 'kesch':
4039
self.exclusive_access = True
40+
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
4141
self.modules = ['cdo']
4242
elif self.current_system.name in ['arolla', 'tsa']:
4343
self.exclusive_access = True
44+
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
4445
self.modules = ['cdo', 'netcdf-fortran']
4546
else:
4647
self.modules = ['CDO']
48+
self.valid_prog_environs = ['builtin']
4749

4850
self.maintainers = ['SO', 'CB']
4951
self.tags = {'production', 'mch', 'external-resources'}

‎cscs-checks/tools/io/nco.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ def __init__(self):
2828
'CDO-NCO')
2929
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
3030
'kesch:pn', 'arolla:pn', 'tsa:pn']
31-
self.valid_prog_environs = ['builtin']
3231
if self.current_system.name in ['arolla', 'kesch', 'tsa']:
3332
self.exclusive_access = True
33+
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
3434
self.modules = ['nco']
3535
else:
3636
self.modules = ['NCO']
37+
self.valid_prog_environs = ['builtin']
3738

3839
self.maintainers = ['SO', 'CB']
3940
self.tags = {'production', 'mch', 'external-resources'}

0 commit comments

Comments
 (0)