Merge branch 'master' into patch-1

Author: Vasileios Karakasis

cscs-checks/apps/jupyter/check_ipcmagic.py

@@ -4,86 +4,26 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import reframe as rfm
-import reframe.utility.osext as osext
-import reframe.utility.sanity as sn
-from reframe.core.backends import getlauncher
+
+from hpctestlib.apps.jupyter.ipcmagic import ipcmagic_check
 
 
 @rfm.simple_test
-class IPCMagicCheck(rfm.RunOnlyRegressionTest):
-    descr = 'Distributed training with TensorFlow using ipyparallel'
+class cscs_ipcmagic_check(ipcmagic_check):
     valid_systems = ['daint:gpu', 'dom:gpu']
-    valid_prog_environs = ['PrgEnv-gnu']
-    modules = [
-        f'ipcmagic', f'jupyterlab',
-        f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
-    ]
-    num_tasks = 2
-    num_tasks_per_node = 1
-    executable = 'ipython'
-    executable_opts = ['tf-hvd-sgd-ipc-tf2.py']
+    valid_prog_environs = ['builtin']
+    modules = ['jupyterlab', 'Horovod']
+    maintainers = ['RS', 'TR']
+    tags = {'production'}
     reference = {
         'daint:gpu': {
             'slope': (2.0, -0.1, 0.1, 'N/A'),
             'offset': (0.0, -0.1, 0.1, 'N/A'),
             'retries': (0, None, None, 'N/A'),
-            'time': (10, None, None, 's'),
         },
         'dom:gpu': {
             'slope': (2.0, -0.1, 0.1, 'N/A'),
             'offset': (0.0, -0.1, 0.1, 'N/A'),
             'retries': (0, None, None, 'N/A'),
-            'time': (10, None, None, 's'),
         }
     }
-
-    maintainers = ['RS', 'TR']
-    tags = {'production'}
-
-    @run_after('setup')
-    def daint_module_workaround(self):
-        if self.current_system.name == 'daint':
-            # FIXME: Use the default modules once Dom/Daint are aligned
-            self.modules = [
-                f'ipcmagic/1.0.1-CrayGNU-{osext.cray_cdt_version()}',
-                f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
-            ]
-            # FIXME: Enforce loading of jupyterlab module since
-            # `module show jupyterlab` throws a Tcl error on Daint
-            self.prerun_cmds = ['module load jupyterlab']
-
-    @sanity_function
-    def assert_successful_execution(self):
-        nids = sn.extractall(r'nid(?P<nid>\d+)', self.stdout, 'nid', str)
-        return sn.all([
-            sn.assert_ne(nids, []), sn.assert_ne(nids[0], nids[1]),
-            sn.assert_found(r'IPCluster is ready\!\s+', self.stdout),
-            sn.assert_found(r'slope=\S+', self.stdout)
-        ])
-
-    @performance_function('N/A')
-    def slope(self):
-        return sn.extractsingle(r'slope=(?P<slope>\S+)', self.stdout,
-                                'slope', float)
-
-    @performance_function('N/A')
-    def offset(self):
-        return sn.extractsingle(r'offset=(?P<offset>\S+)', self.stdout,
-                                'offset', float)
-
-    @performance_function('N/A')
-    def retries(self):
-        return 4 - sn.count(sn.findall(r'IPCluster is already running',
-                                       self.stdout))
-
-    @performance_function('s')
-    def time(self):
-        return sn.extractsingle(r'IPCluster is ready\!\s+'
-                                r'\((?P<time>\d+) seconds\)',
-                                self.stdout, 'time', float)
-
-    @run_before('run')
-    def reset_launcher(self):
-        # Change the job launcher since `ipython`
-        # needs to be launched without `srun`.
-        self.job.launcher = getlauncher('local')()

docs/config_reference.rst

@@ -1257,6 +1257,21 @@ General Configuration
    The command-line option sets the configuration option to ``false``.
 
 
+.. js:attribute:: .general[].compact_test_names
+
+   :required: No
+   :default: ``false``
+
+   Use a compact test naming scheme.
+   When set to ``true``, the test parameter values will not be encoded into the test name.
+   Instead, the several test variants are differentiated by including the unique variant number into the test name.
+
+   .. warning::
+      The default value will be changed to ``true`` in version 4.0.0.
+
+   .. versionadded:: 3.9.0
+
+
 .. js:attribute:: .general[].git_timeout
 
   :required: No

docs/hpctestlib.rst

@@ -1,5 +1,7 @@
-ReFrame Test Library
-====================
+ReFrame Test Library (experimental)
+===================================
+
+This is a collection of generic tests that you can either run out-of-the-box by specializing them for your system using the :option:`-S` option or create your site-specific tests by building upon them.
 
 
 Scientific Applications
@@ -16,3 +18,11 @@ Python
 .. automodule:: hpctestlib.python.numpy.numpy_ops
    :members:
    :show-inheritance:
+
+
+Interactive Computing
+-----------------------
+
+.. automodule:: hpctestlib.apps.jupyter.ipcmagic
+   :members:
+   :show-inheritance:

docs/manpage.rst

@@ -747,6 +747,21 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
       ================================== ==================
 
 
+.. envvar:: RFM_COMPACT_TEST_NAMES
+
+   Enable the compact test naming scheme.
+
+   .. table::
+      :align: left
+
+      ================================== ==================
+      Associated command line option     N/A
+      Associated configuration parameter :js:attr:`compact_test_names` general configuration parameter
+      ================================== ==================
+
+   .. versionadded:: 3.9.0
+
+
 .. envvar:: RFM_CONFIG_FILE
 
    Set the configuration file for ReFrame.