Merge branch 'master' into feat/skip-tests

Author: Vasileios Karakasis

cscs-checks/apps/jupyter/check_ipcmagic.py

@@ -15,19 +15,10 @@ def __init__(self):
         self.descr = 'Distributed training with TensorFlow using ipyparallel'
         self.valid_systems = ['daint:gpu', 'dom:gpu']
         self.valid_prog_environs = ['PrgEnv-gnu']
-        cray_cdt_version = osext.cray_cdt_version()
-        # FIXME: The following will not be needed after the Daint upgrade
-        if self.current_system.name == 'dom':
-            self.modules = [
-                'ipcmagic',
-                f'Horovod/0.21.0-CrayGNU-{cray_cdt_version}-tf-2.4.0'
-            ]
-        else:
-            self.modules = [
-                'ipcmagic',
-                'Horovod/0.19.1-CrayGNU-20.08-tf-2.2.0'
-            ]
-
+        self.modules = [
+            f'ipcmagic',
+            f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
+        ]
         self.num_tasks = 2
         self.num_tasks_per_node = 1
         self.executable = 'ipython'

cscs-checks/apps/quantumespresso/quantumespresso_check.py

@@ -8,6 +8,9 @@
 
 
 class QuantumESPRESSOCheck(rfm.RunOnlyRegressionTest):
+    scale = parameter(['small', 'large'])
+    variant = parameter(['maint', 'prod'])
+
     def __init__(self):
         if self.current_system.name == 'pilatus':
             self.valid_prog_environs = ['cpeGNU']
@@ -37,15 +40,14 @@ def __init__(self):
         }
 
 
-@rfm.parameterized_test(*([s, v]
-                          for s in ['small', 'large']
-                          for v in ['maint', 'prod']))
+@rfm.simple_test
 class QuantumESPRESSOCpuCheck(QuantumESPRESSOCheck):
-    def __init__(self, scale, variant):
+    def __init__(self):
         super().__init__()
-        self.descr = f'QuantumESPRESSO CPU check (version: {scale}, {variant})'
+        self.descr = (f'QuantumESPRESSO CPU check (version: {self.scale}, '
+                      f'{self.variant})')
         self.valid_systems = ['daint:mc', 'eiger:mc', 'pilatus:mc']
-        if scale == 'small':
+        if self.scale == 'small':
             self.valid_systems += ['dom:mc']
             energy_reference = -11427.09017218
             if self.current_system.name in ['daint', 'dom']:
@@ -86,8 +88,6 @@ def __init__(self, scale, variant):
         energy_diff = sn.abs(energy-energy_reference)
         self.sanity_patterns = sn.all([
             self.sanity_patterns,
-            # FIXME temporarily increase energy difference
-            # (different QE default on Dom and Daint)
             sn.assert_lt(energy_diff, 1e-6)
         ])
 
@@ -120,8 +120,10 @@ def __init__(self, scale, variant):
             }
         }
 
-        self.reference = references[variant][scale]
-        self.tags |= {'maintenance' if variant == 'maint' else 'production'}
+        self.reference = references[self.variant][self.scale]
+        self.tags |= {
+            'maintenance' if self.variant == 'maint' else 'production'
+        }
 
     @rfm.run_before('run')
     def set_task_distribution(self):
@@ -132,16 +134,15 @@ def set_cpu_binding(self):
         self.job.launcher.options = ['--cpu-bind=cores']
 
 
-@rfm.parameterized_test(*([s, v]
-                          for s in ['small', 'large']
-                          for v in ['maint', 'prod']))
+@rfm.simple_test
 class QuantumESPRESSOGpuCheck(QuantumESPRESSOCheck):
-    def __init__(self, scale, variant):
+    def __init__(self):
         super().__init__()
-        self.descr = f'QuantumESPRESSO GPU check (version: {scale}, {variant})'
+        self.descr = (f'QuantumESPRESSO GPU check (version: {self.scale}, '
+                      f'{self.variant})')
         self.valid_systems = ['daint:gpu']
         self.num_gpus_per_node = 1
-        if scale == 'small':
+        if self.scale == 'small':
             self.valid_systems += ['dom:gpu']
             self.num_tasks = 6
             energy_reference = -11427.09017168
@@ -157,8 +158,6 @@ def __init__(self, scale, variant):
         energy_diff = sn.abs(energy-energy_reference)
         self.sanity_patterns = sn.all([
             self.sanity_patterns,
-            # FIXME temporarily increase energy difference
-            # (different CUDA default on Dom and Daint)
             sn.assert_lt(energy_diff, 1e-7)
         ])
 
@@ -183,5 +182,7 @@ def __init__(self, scale, variant):
             }
         }
 
-        self.reference = references[variant][scale]
-        self.tags |= {'maintenance' if variant == 'maint' else 'production'}
+        self.reference = references[self.variant][self.scale]
+        self.tags |= {
+            'maintenance' if self.variant == 'maint' else 'production'
+        }

cscs-checks/apps/tensorflow/tf2_horovod_check.py

@@ -8,26 +8,21 @@
 import reframe.utility.osext as osext
 
 
-@rfm.parameterized_test(['small'], ['large'])
+@rfm.simple_test
 class TensorFlow2HorovodTest(rfm.RunOnlyRegressionTest):
-    def __init__(self, variant):
+    variant = parameter(['small', 'large'])
+
+    def __init__(self):
         self.descr = 'Distributed training with TensorFlow2 and Horovod'
         self.valid_systems = ['daint:gpu']
         self.valid_prog_environs = ['builtin']
-
-        cray_cdt_version = osext.cray_cdt_version()
-        # FIXME: The following will not be needed after the Daint upgrade
-        if self.current_system.name == 'dom':
-            self.modules = [
-                f'Horovod/0.21.0-CrayGNU-{cray_cdt_version}-tf-2.4.0'
-            ]
-        else:
-            self.modules = ['Horovod/0.19.1-CrayGNU-20.08-tf-2.2.0']
-
+        self.modules = [
+            f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
+        ]
         self.sourcesdir = None
         self.num_tasks_per_node = 1
         self.num_cpus_per_task = 12
-        if variant == 'small':
+        if self.variant == 'small':
             self.valid_systems += ['dom:gpu']
             self.num_tasks = 8
             self.reference = {

cscs-checks/compile/libsci_acc_symlink.py

@@ -9,29 +9,30 @@
 import reframe.utility.sanity as sn
 
 
-# FIXME: Remove the 71 entries after daint upgrade
-@rfm.parameterized_test(['libsci_acc_gnu_81_nv35'],
-                        ['libsci_acc_gnu_81_nv60'],
-                        ['libsci_acc_cray_nv35'],
-                        ['libsci_acc_cray_nv60'],
-                        ['libsci_acc_cray_nv35_openacc'],
-                        ['libsci_acc_cray_nv60_openacc'])
+@rfm.simple_test
 class LibSciAccSymLinkTest(rfm.RunOnlyRegressionTest):
-    def __init__(self, lib_name):
-        self.descr = 'LibSciAcc symlink check of %s' % lib_name
+    lib_name = parameter([
+        'libsci_acc_gnu_81_nv35', 'libsci_acc_gnu_81_nv60',
+        'libsci_acc_cray_nv35', 'libsci_acc_cray_nv60',
+        'libsci_acc_cray_nv35_openacc', 'libsci_acc_cray_nv60_openacc'
+    ])
+
+    def __init__(self):
+        self.descr = f'LibSciAcc symlink check of {self.lib_name}'
         self.valid_systems = [
             'daint:login', 'daint:gpu',
             'dom:login', 'dom:gpu',
         ]
         regex = (r'libsci_acc_(?P<prgenv>[A-Za-z]+)_((?P<cver>[A-Za-z0-9]+)_)'
                  r'?(?P<version>\S+)')
-        prgenv = re.match(regex, lib_name).group('prgenv')
+        prgenv = re.match(regex, self.lib_name).group('prgenv')
 
         # The prgenv is irrelevant for this case, so just chose one
         self.valid_prog_environs = ['builtin']
         self.executable = 'ls'
         self.executable_opts = ['-al', '/opt/cray/pe/lib64/libsci_a*']
-        self.sanity_patterns = sn.assert_found(f'{lib_name}.so', self.stdout)
+        self.sanity_patterns = sn.assert_found(f'{self.lib_name}.so',
+                                               self.stdout)
 
         self.maintainers = ['AJ', 'LM']
         self.tags = {'production', 'craype', 'health'}

cscs-checks/libraries/io/h5py_parallel_run.py

@@ -23,4 +23,5 @@ def __init__(self):
         self.executable = 'python'
         self.executable_opts = ['h5py_mpi_test.py']
         self.postrun_cmds = ['h5dump parallel_test.hdf5']
+        self.tags = {'health'}
         self.maintainers = ['TM']

cscs-checks/libraries/io/hdf5_compile_run.py

@@ -80,4 +80,4 @@ def __init__(self, lang, linkage):
         self.postrun_cmds = ['h5dump h5ex_d_chunk.h5 > h5dump_out.txt']
 
         self.maintainers = ['SO', 'RS']
-        self.tags = {'production', 'craype'}
+        self.tags = {'production', 'craype', 'health'}

cscs-checks/libraries/io/netcdf_compile_run.py

@@ -47,7 +47,7 @@ def __init__(self, lang, linkage):
         self.num_tasks_per_node = 1
         self.sanity_patterns = sn.assert_found(r'SUCCESS', self.stdout)
         self.maintainers = ['AJ', 'SO']
-        self.tags = {'production', 'craype', 'external-resources'}
+        self.tags = {'production', 'craype', 'external-resources', 'health'}
 
     @rfm.run_before('compile')
     def setflags(self):

cscs-checks/libraries/math/scalapack_compile_run.py

@@ -3,17 +3,13 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-import os
-
 import reframe as rfm
 import reframe.utility.sanity as sn
 
 
 class ScaLAPACKTest(rfm.RegressionTest):
     def __init__(self, linkage):
         self.linkage = linkage
-        self.sourcesdir = os.path.join(self.current_system.resourcesdir,
-                                       'scalapack')
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:mc', 'dom:gpu']
         if self.linkage == 'dynamic':
             self.valid_systems.append('eiger:mc')
@@ -33,7 +29,7 @@ def __init__(self, linkage):
 class ScaLAPACKSanity(ScaLAPACKTest):
     def __init__(self, linkage):
         super().__init__(linkage)
-        self.sourcepath = 'scalapack_compile_run.f'
+        self.sourcepath = 'sample_pdsyev_call.f'
 
         def fortran_float(value):
             return float(value.replace('D', 'E'))