Merge pull request #1160 from ekouts/check/update_syntax

[test] Update tests with the new syntax using decorators

Author: Vasileios Karakasis

cscs-checks/analytics/spark/spark_check.py

@@ -15,7 +15,6 @@
 @rfm.simple_test
 class SparkAnalyticsCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        super().__init__()
         self.descr = 'Simple calculation of pi with Spark'
         self.valid_systems = ['daint:gpu', 'daint:mc']
         self.valid_prog_environs = ['PrgEnv-cray']
@@ -26,17 +25,19 @@ def __init__(self):
                                     self.stdout, 'pi', float)
         self.sanity_patterns = sn.assert_lt(sn.abs(pi_value - math.pi), 0.01)
         self.maintainers = ['TM', 'TR']
-        self.tags = {'production', 'craype'}
+        self.tags = {'craype'}
 
-    def setup(self, partition, environ, **job_opts):
-        if partition.fullname == 'daint:gpu':
+    @rfm.run_after('setup')
+    def set_num_tasks(self):
+        if self.current_partition.fullname == 'daint:gpu':
             self.num_tasks = 48
             self.num_tasks_per_node = 12
         else:
             self.num_tasks = 72
             self.num_tasks_per_node = 18
 
-        super().setup(partition, environ, **job_opts)
+    @rfm.run_before('run')
+    def set_launcher(self):
         # The job launcher has to be changed since the `start_analytics`
         # script is not used with srun.
         self.job.launcher = getlauncher('local')()

cscs-checks/apps/amber/amber_check.py

@@ -11,11 +11,8 @@
 
 class AmberBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, input_file, output_file):
-        super().__init__()
-
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'Amber')
-
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.modules = ['Amber']
         self.num_tasks = 1

cscs-checks/apps/cp2k/cp2k_check.py

@@ -10,7 +10,6 @@
 
 class Cp2kCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        super().__init__()
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.executable = 'cp2k.psmp'
         self.executable_opts = ['H2O-256.inp']

cscs-checks/apps/cpmd/cpmd_check.py

@@ -11,7 +11,6 @@
 @rfm.parameterized_test(['small'], ['large'])
 class CPMDCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, scale):
-        super().__init__()
         self.descr = 'CPMD check (C4H6 metadynamics)'
         self.maintainers = ['AJ', 'LM']
         self.tags = {'production'}

cscs-checks/apps/espresso/espresso_check.py

@@ -13,7 +13,6 @@
 @rfm.parameterized_test(['small'], ['large'])
 class QECheck(rfm.RunOnlyRegressionTest):
     def __init__(self, scale):
-        super().__init__()
         self.descr = 'Quantum Espresso CPU check'
         self.maintainers = ['LM', 'CB']
         self.tags = {'scs', 'production', 'external-resources'}

cscs-checks/apps/icon/rrtmgp_check.py

@@ -14,7 +14,6 @@ class RRTMGPTest(rfm.RegressionTest):
     '''This is an outdated PoC test for ICON-RRTMGP.'''
 
     def __init__(self):
-        super().__init__()
         self.valid_systems = ['dom:gpu', 'daint:gpu']
         self.valid_prog_environs = ['PrgEnv-pgi']
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,

cscs-checks/apps/lammps/lammps_check.py

@@ -11,7 +11,6 @@
 
 class LAMMPSBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        super().__init__()
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.modules = ['LAMMPS']
 

cscs-checks/apps/namd/namd_check.py

@@ -11,7 +11,6 @@
 
 class NamdBaseCheck(rfm.RunOnlyRegressionTest):
     def __init__(self, arch, scale, variant):
-        super().__init__()
         self.descr = 'NAMD check (%s, %s)' % (arch, variant)
         self.valid_prog_environs = ['PrgEnv-intel']
         self.modules = ['NAMD']
@@ -43,8 +42,8 @@ def __init__(self, arch, scale, variant):
 
         self.perf_patterns = {
             'days_ns': sn.avg(sn.extractall(
-                'Info: Benchmark time: \S+ CPUs \S+ '
-                's/step (?P<days_ns>\S+) days/ns \S+ MB memory',
+                r'Info: Benchmark time: \S+ CPUs \S+ '
+                r's/step (?P<days_ns>\S+) days/ns \S+ MB memory',
                 self.stdout, 'days_ns', float))
         }
 

cscs-checks/apps/paraview/paraview_check.py

@@ -10,7 +10,6 @@
 @rfm.simple_test
 class ParaViewCheck(rfm.RunOnlyRegressionTest):
     def __init__(self):
-        super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.num_tasks = 12
@@ -24,26 +23,15 @@ def __init__(self):
         self.maintainers = ['JF']
         self.tags = {'scs', 'production'}
 
-    def setup(self, partition, environ, **job_opts):
-        if partition.fullname == 'daint:mc':
-            self.sanity_patterns = sn.assert_found('Vendor:   VMware, Inc.',
-                                                   self.stdout)
-            self.sanity_patterns = sn.assert_found('Renderer: llvmpipe',
-                                                   self.stdout)
-        elif partition.fullname == 'daint:gpu':
-            self.sanity_patterns = sn.assert_found(
-                'Vendor:   NVIDIA Corporation', self.stdout)
-            self.sanity_patterns = sn.assert_found('Renderer: Tesla P100',
-                                                   self.stdout)
-        elif partition.fullname == 'dom:gpu':
-            self.sanity_patterns = sn.assert_found(
-                'Vendor:   NVIDIA Corporation', self.stdout)
-            self.sanity_patterns = sn.assert_found('Renderer: Tesla P100',
-                                                   self.stdout)
-        elif partition.fullname == 'dom:mc':
-            self.sanity_patterns = sn.assert_found('Vendor:   VMware, Inc.',
-                                                   self.stdout)
-            self.sanity_patterns = sn.assert_found('Renderer: llvmpipe',
-                                                   self.stdout)
-
-        super().setup(partition, environ, **job_opts)
+    @rfm.run_before('sanity')
+    def set_sanity(self):
+        if self.current_partition.name == 'mc':
+            self.sanity_patterns = sn.all([
+                sn.assert_found('Vendor:   VMware, Inc.', self.stdout),
+                sn.assert_found('Renderer: llvmpipe', self.stdout)
+            ])
+        elif self.current_partition.name == 'gpu':
+            self.sanity_patterns = sn.all([
+                sn.assert_found('Vendor:   NVIDIA Corporation', self.stdout),
+                sn.assert_found('Renderer: Tesla P100', self.stdout)
+            ])

cscs-checks/compile/haswell_fma_check.py

@@ -11,7 +11,6 @@
 @rfm.simple_test
 class HaswellFmaCheck(rfm.CompileOnlyRegressionTest):
     def __init__(self):
-        super().__init__()
         self.descr = 'check for avx2 instructions'
         self.valid_systems = ['dom:login', 'daint:login', 'kesch:login']
         if self.current_system.name == 'kesch':
@@ -41,9 +40,10 @@ def __init__(self):
         self.maintainers = ['AJ', 'CB']
         self.tags = {'production', 'craype'}
 
-    def setup(self, partition, environ, **job_opts):
+    @rfm.run_before('compile')
+    def setflags(self):
         if self.current_system.name == 'kesch':
-            if environ.name.startswith('PrgEnv-cray'):
+            if self.current_environ.name.startswith('PrgEnv-cray'):
                 # Ignore CPATH warning
                 self.build_system.cflags += ['-h nomessage=1254']
                 self.build_system.cxxflags += ['-h nomessage=1254']
@@ -52,8 +52,7 @@ def setup(self, partition, environ, **job_opts):
                 self.build_system.cxxflags += ['-march=native']
                 self.build_system.fflags += ['-march=native']
         else:
-            if environ.name == 'PrgEnv-cray':
+            if self.current_environ.name == 'PrgEnv-cray':
                 self.build_system.cflags = ['-Ofast', '-S']
                 self.build_system.cxxflags = ['-Ofast', '-S']
 
-        super().setup(partition, environ, **job_opts)