Skip to content

Commit f468b0f

Browse files
victorusuvictorusu
committed
Extend builtin PrgEnv to more tests
1 parent f521a20 commit f468b0f

File tree

9 files changed

+33
-27
lines changed

9 files changed

+33
-27
lines changed

‎config/cscs.py‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,35 @@ class ReframeSettings:
2323
'partitions': {
2424
'login': {
2525
'scheduler': 'local',
26-
'environs': ['PrgEnv-gnu'],
26+
'environs': ['builtin', 'PrgEnv-gnu'],
2727
'descr': 'Login nodes',
2828
'max_jobs': 4
2929
},
3030
'amdv100': {
3131
'scheduler': 'nativeslurm',
3232
'access': ['-pamdv100'],
33-
'environs': ['PrgEnv-gnu'],
33+
'environs': ['builtin', 'PrgEnv-gnu'],
3434
'descr': 'AMD Naples 32c + 2x NVIDIA V100',
3535
'max_jobs': 100,
3636
},
3737
'amdvega': {
3838
'scheduler': 'nativeslurm',
3939
'access': ['-pamdvega'],
40-
'environs': ['PrgEnv-gnu'],
40+
'environs': ['builtin', 'PrgEnv-gnu'],
4141
'descr': 'AMD Naples 32c + 3x AMD GFX900',
4242
'max_jobs': 100,
4343
},
4444
'intelv100': {
4545
'scheduler': 'nativeslurm',
4646
'access': ['-pintelv100'],
47-
'environs': ['PrgEnv-gnu'],
47+
'environs': ['builtin', 'PrgEnv-gnu'],
4848
'descr': 'Intel Skylake 36c + 4x NVIDIA V100',
4949
'max_jobs': 100,
5050
},
5151
'intel': {
5252
'scheduler': 'nativeslurm',
5353
'access': ['-pintel'],
54-
'environs': ['PrgEnv-gnu'],
54+
'environs': ['builtin', 'PrgEnv-gnu'],
5555
'descr': 'Intel Skylake 36c',
5656
'max_jobs': 100,
5757
}
@@ -66,7 +66,7 @@ class ReframeSettings:
6666
'partitions': {
6767
'login': {
6868
'scheduler': 'local',
69-
'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
69+
'environs': ['builtin', 'PrgEnv-cray', 'PrgEnv-gnu',
7070
'PrgEnv-intel', 'PrgEnv-pgi'],
7171
'descr': 'Login nodes',
7272
'max_jobs': 4
@@ -279,15 +279,17 @@ class ReframeSettings:
279279
'scheduler': 'local',
280280
'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi',
281281
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
282-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
282+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
283+
'builtin'],
283284
'descr': 'Kesch login nodes',
284285
},
285286
'pn': {
286287
'scheduler': 'nativeslurm',
287288
'access': ['--partition=pn-regression'],
288289
'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi',
289290
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
290-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
291+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
292+
'builtin'],
291293
'descr': 'Kesch post-processing nodes'
292294
},
293295

@@ -296,7 +298,8 @@ class ReframeSettings:
296298
'access': ['--partition=cn-regression'],
297299
'environs': ['PrgEnv-cray', 'PrgEnv-cray-nompi',
298300
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
299-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
301+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
302+
'builtin'],
300303
'descr': 'Kesch compute nodes',
301304
'resources': {
302305
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'],
@@ -314,21 +317,24 @@ class ReframeSettings:
314317
'login': {
315318
'scheduler': 'local',
316319
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
317-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
320+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
321+
'builtin'],
318322
'descr': 'Arolla login nodes',
319323
},
320324
'pn': {
321325
'scheduler': 'nativeslurm',
322326
'access': ['--partition=pn-regression'],
323327
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
324-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
328+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
329+
'builtin'],
325330
'descr': 'Arolla post-processing nodes',
326331
},
327332
'cn': {
328333
'scheduler': 'nativeslurm',
329334
'access': ['--partition=cn-regression'],
330335
'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi',
331-
'PrgEnv-pgi', 'PrgEnv-pgi-nompi'],
336+
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
337+
'builtin'],
332338
'descr': 'Arolla compute nodes',
333339
'resources': {
334340
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'],
@@ -346,21 +352,24 @@ class ReframeSettings:
346352
'login': {
347353
'scheduler': 'local',
348354
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
349-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
355+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
356+
'builtin'],
350357
'descr': 'Tsa login nodes',
351358
},
352359
'pn': {
353360
'scheduler': 'nativeslurm',
354361
'access': ['--partition=pn-regression'],
355362
'environs': ['PrgEnv-pgi', 'PrgEnv-pgi-nompi',
356-
'PrgEnv-gnu', 'PrgEnv-gnu-nompi'],
363+
'PrgEnv-gnu', 'PrgEnv-gnu-nompi',
364+
'builtin'],
357365
'descr': 'Tsa post-processing nodes',
358366
},
359367
'cn': {
360368
'scheduler': 'nativeslurm',
361369
'access': ['--partition=cn-regression'],
362370
'environs': ['PrgEnv-gnu', 'PrgEnv-gnu-nompi',
363-
'PrgEnv-pgi', 'PrgEnv-pgi-nompi'],
371+
'PrgEnv-pgi', 'PrgEnv-pgi-nompi',
372+
'builtin'],
364373
'descr': 'Tsa compute nodes',
365374
'resources': {
366375
'_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}'],

‎cscs-checks/libraries/hpx/hpx_hello_world.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class HelloWorldHPXCheck(rfm.RunOnlyRegressionTest):
1212
def __init__(self):
1313
self.descr = 'HPX hello, world check'
1414
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
15-
self.valid_prog_environs = ['PrgEnv-gnu']
15+
self.valid_prog_environs = ['builtin']
1616

1717
self.modules = ['HPX']
1818
self.executable = 'hello_world_distributed'

‎cscs-checks/libraries/hpx/hpx_stencil.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Stencil4HPXCheck(rfm.RunOnlyRegressionTest):
1212
def __init__(self):
1313
self.descr = 'HPX 1d_stencil_4 check'
1414
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
15-
self.valid_prog_environs = ['PrgEnv-gnu']
15+
self.valid_prog_environs = ['builtin']
1616

1717
self.modules = ['HPX']
1818
self.executable = '1d_stencil_4'

‎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 = ['PrgEnv-pgi-nompi']
35+
self.valid_prog_environs = ['builtin']
3636

3737
if lang != 'f90':
38-
self.valid_prog_environs += ['PrgEnv-cray-nompi']
38+
self.valid_prog_environs += ['builtin']
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 = ['PrgEnv-gnu-nompi']
18+
self.valid_prog_environs = ['builtin']
1919
self.executable = 'cookbook/run.bash'
2020

2121
self.num_tasks = 1

‎cscs-checks/microbenchmarks/simd/nsimd.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class NsimdTest(rfm.RegressionTest):
7676
'''
7777
def __init__(self):
7878
self.valid_systems = ['dom:mc', 'dom:gpu']
79-
self.valid_prog_environs = ['PrgEnv-gnu']
79+
self.valid_prog_environs = ['builtin']
8080
self.descr = 'sqrt.avx2.f64 example'
8181
self.build_system = 'SingleSource'
8282
self.testname = 'sqrt.avx2.f64'

‎cscs-checks/microbenchmarks/simd/vc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class VcSimdTest(rfm.RegressionTest):
2929
'''
3030
def __init__(self):
3131
self.valid_systems = ['*']
32-
self.valid_prog_environs = ['PrgEnv-gnu']
32+
self.valid_prog_environs = ['builtin']
3333
self.descr = 'finitediff example'
3434
self.build_system = 'SingleSource'
3535
self.testname = 'finitediff'

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,14 @@ 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']
3839
if self.current_system.name == 'kesch':
3940
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']
4544
self.modules = ['cdo', 'netcdf-fortran']
4645
else:
47-
self.valid_prog_environs = ['PrgEnv-gnu']
4846
self.modules = ['CDO']
4947

5048
self.maintainers = ['SO', 'CB']

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ 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']
3132
if self.current_system.name in ['arolla', 'kesch', 'tsa']:
3233
self.exclusive_access = True
33-
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
3434
self.modules = ['nco']
3535
else:
36-
self.valid_prog_environs = ['PrgEnv-gnu']
3736
self.modules = ['NCO']
3837

3938
self.maintainers = ['SO', 'CB']

0 commit comments

Comments
 (0)