Skip to content

Commit 92efd1f

Browse files
author
Vasileios Karakasis
authored
Merge pull request #1799 from teojgo/bugfix/tests_no_valid_prgenvs
[test] Fix checks not defining valid_prog_environs
2 parents 1809565 + e9c96a4 commit 92efd1f

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

cscs-checks/libraries/io/netcdf_compile_run.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ def __init__(self, lang, linkage):
2222
self.lang = lang
2323
self.linkage = linkage
2424
self.descr = f'{lang_names[lang]} NetCDF {linkage.capitalize()}'
25-
self.valid_systems = ['daint:gpu', 'daint:mc',
26-
'dom:gpu', 'dom:mc',
27-
'arolla:cn', 'tsa:cn',
28-
'eiger:mc']
25+
self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
26+
'arolla:cn', 'tsa:cn', 'eiger:mc']
2927
if linkage == 'static':
3028
self.valid_systems.remove('eiger:mc')
3129

@@ -39,6 +37,8 @@ def __init__(self, lang, linkage):
3937
elif self.current_system.name in ['eiger']:
4038
self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu']
4139
self.modules = ['cray-hdf5', 'cray-netcdf']
40+
else:
41+
self.valid_prog_environs = []
4242

4343
self.sourcesdir = os.path.join(self.current_system.resourcesdir,
4444
'netcdf')

cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ def __init__(self):
2121
'arolla:cn', 'arolla:pn', 'tsa:cn', 'tsa:pn']
2222
if self.current_system.name in ['daint', 'dom']:
2323
self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel']
24-
if self.current_system.name in ['arolla', 'tsa']:
24+
elif self.current_system.name in ['arolla', 'tsa']:
2525
self.valid_prog_environs = ['PrgEnv-gnu-nompi']
26+
else:
27+
self.valid_prog_environs = []
28+
2629

2730
self.num_tasks = 0
2831
self.use_multithreading = False

cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
@rfm.parameterized_test(['sync'], ['async'])
1212
class KernelLatencyTest(rfm.RegressionTest):
1313
def __init__(self, kernel_version):
14-
self.valid_systems = ['daint:gpu', 'dom:gpu',
15-
'arolla:cn', 'tsa:cn',
16-
'ault:amdv100', 'ault:intelv100',
17-
'ault:amda100', 'ault:amdvega']
14+
self.valid_systems = [
15+
'daint:gpu', 'dom:gpu', 'arolla:cn', 'tsa:cn', 'ault:amdv100',
16+
'ault:intelv100', 'ault:amda100', 'ault:amdvega'
17+
]
1818
cs = self.current_system.name
1919
if cs in {'dom', 'daint'}:
2020
self.valid_prog_environs = ['PrgEnv-cray_classic', 'PrgEnv-cray',
@@ -23,6 +23,8 @@ def __init__(self, kernel_version):
2323
self.valid_prog_environs = ['PrgEnv-pgi']
2424
elif cs in {'ault'}:
2525
self.valid_prog_environs = ['PrgEnv-gnu']
26+
else:
27+
self.valid_prog_environs = []
2628

2729
self.num_tasks = 0
2830
self.num_tasks_per_node = 1

0 commit comments

Comments
 (0)