From 595f0cf877af2645311ebe7babcd566a4789064a Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 19 Feb 2021 13:40:54 +0100 Subject: [PATCH 1/2] Fix checks not defining valid_prog_environs --- cscs-checks/libraries/io/netcdf_compile_run.py | 8 ++++---- cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py | 5 ++++- .../gpu/kernel_latency/kernel_latency.py | 10 ++++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 0ebda2957b..3f18b78bc5 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -22,10 +22,8 @@ def __init__(self, lang, linkage): self.lang = lang self.linkage = linkage self.descr = f'{lang_names[lang]} NetCDF {linkage.capitalize()}' - self.valid_systems = ['daint:gpu', 'daint:mc', - 'dom:gpu', 'dom:mc', - 'arolla:cn', 'tsa:cn', - 'eiger:mc'] + self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc', + 'arolla:cn', 'tsa:cn', 'eiger:mc'] if linkage == 'static': self.valid_systems.remove('eiger:mc') @@ -39,6 +37,8 @@ def __init__(self, lang, linkage): elif self.current_system.name in ['eiger']: self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu'] self.modules = ['cray-hdf5', 'cray-netcdf'] + else: + self.valid_prog_environs = [] self.sourcesdir = os.path.join(self.current_system.resourcesdir, 'netcdf') diff --git a/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py b/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py index 7f24250152..a8abe8af08 100644 --- a/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/cpu/dgemm/dgemm.py @@ -21,8 +21,11 @@ def __init__(self): 'arolla:cn', 'arolla:pn', 'tsa:cn', 'tsa:pn'] if self.current_system.name in ['daint', 'dom']: self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-intel'] - if self.current_system.name in ['arolla', 'tsa']: + elif self.current_system.name in ['arolla', 'tsa']: self.valid_prog_environs = ['PrgEnv-gnu-nompi'] + else: + self.valid_prog_environs = [] + self.num_tasks = 0 self.use_multithreading = False diff --git a/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py b/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py index 8a228bb2d8..81de7e1cfa 100644 --- a/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py +++ b/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py @@ -11,10 +11,10 @@ @rfm.parameterized_test(['sync'], ['async']) class KernelLatencyTest(rfm.RegressionTest): def __init__(self, kernel_version): - self.valid_systems = ['daint:gpu', 'dom:gpu', - 'arolla:cn', 'tsa:cn', - 'ault:amdv100', 'ault:intelv100', - 'ault:amda100', 'ault:amdvega'] + self.valid_systems = [ + 'daint:gpu', 'dom:gpu', 'arolla:cn', 'tsa:cn', 'ault:amdv100', + 'ault:intelv100', 'ault:amda100', 'ault:amdvega' + ] cs = self.current_system.name if cs in {'dom', 'daint'}: self.valid_prog_environs = ['PrgEnv-cray_classic', 'PrgEnv-cray', @@ -23,6 +23,8 @@ def __init__(self, kernel_version): self.valid_prog_environs = ['PrgEnv-pgi'] elif cs in {'ault'}: self.valid_prog_environs = ['PrgEnv-gnu'] + else: + self.valid_prog_environs = ['PrgEnv-gnu'] self.num_tasks = 0 self.num_tasks_per_node = 1 From 89d8714c8bb9658da558af38cfb1e8bc6214a775 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 19 Feb 2021 13:44:05 +0100 Subject: [PATCH 2/2] Fix nonempty valid_prog_environs --- .../microbenchmarks/gpu/kernel_latency/kernel_latency.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py b/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py index 81de7e1cfa..d11fb667de 100644 --- a/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py +++ b/cscs-checks/microbenchmarks/gpu/kernel_latency/kernel_latency.py @@ -24,7 +24,7 @@ def __init__(self, kernel_version): elif cs in {'ault'}: self.valid_prog_environs = ['PrgEnv-gnu'] else: - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = [] self.num_tasks = 0 self.num_tasks_per_node = 1