From 70f47535e83a95b65e78b04c7fd3cc8b1d8eeafe Mon Sep 17 00:00:00 2001 From: Javier Otero Date: Mon, 28 Jun 2021 12:24:19 +0200 Subject: [PATCH 1/2] Add env nvidia to cuda stress test --- cscs-checks/mch/cuda_stress_test.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cscs-checks/mch/cuda_stress_test.py b/cscs-checks/mch/cuda_stress_test.py index eb363349cf..c3fd403342 100644 --- a/cscs-checks/mch/cuda_stress_test.py +++ b/cscs-checks/mch/cuda_stress_test.py @@ -8,7 +8,7 @@ @rfm.simple_test -class CudaStressTest(rfm.RegressionTest): +class cuda_stress_test(rfm.RegressionTest): descr = 'MCH CUDA stress test' valid_systems = ['daint:gpu', 'dom:gpu', 'arolla:cn', 'tsa:cn'] valid_prog_environs = ['*'] @@ -25,9 +25,14 @@ def set_environment(self): self.exclusive_access = True self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-gnu-nompi', 'PrgEnv-pgi', 'PrgEnv-pgi-nompi'] - self.modules = ['cuda/10.1.243'] else: - self.valid_prog_environs = ['PrgEnv-gnu'] + self.valid_prog_environs = ['PrgEnv-gnu', 'PrgEnv-nvidia'] + + @run_after('setup') + def set_modules(self): + if self.current_system.name in{'arolla', 'tsa'}: + self.modules = ['cuda/10.1.243'] + elif self.current_environ.name != 'PrgEnv-nvidia': self.modules = ['craype-accel-nvidia60', 'cdt-cuda'] @run_before('compile') From 55a3d492f7aab8ce633c20b212c10357319d404c Mon Sep 17 00:00:00 2001 From: Javier Otero Date: Mon, 28 Jun 2021 12:51:46 +0200 Subject: [PATCH 2/2] Style fixes --- cscs-checks/mch/cuda_stress_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/mch/cuda_stress_test.py b/cscs-checks/mch/cuda_stress_test.py index c3fd403342..76eff4ae64 100644 --- a/cscs-checks/mch/cuda_stress_test.py +++ b/cscs-checks/mch/cuda_stress_test.py @@ -30,7 +30,7 @@ def set_environment(self): @run_after('setup') def set_modules(self): - if self.current_system.name in{'arolla', 'tsa'}: + if self.current_system.name in {'arolla', 'tsa'}: self.modules = ['cuda/10.1.243'] elif self.current_environ.name != 'PrgEnv-nvidia': self.modules = ['craype-accel-nvidia60', 'cdt-cuda']