Merge branch 'master' into tensorflow_test

Author: Vasileios Karakasis

cscs-checks/apps/jupyter/check_ipcmagic.py

@@ -5,7 +5,7 @@
 
 import reframe as rfm
 
-from hpctestlib.sciapps.jupyter.ipcmagic import ipcmagic_check
+from hpctestlib.interactive.jupyter.ipcmagic import ipcmagic_check
 
 
 @rfm.simple_test

cscs-checks/apps/spark/spark_check.py

@@ -5,7 +5,7 @@
 
 import reframe as rfm
 
-from hpctestlib.data_analytics.spark.compute_pi import compute_pi_check
+from hpctestlib.data_analytics.spark.spark_checks import compute_pi_check
 
 
 @rfm.simple_test

docs/hpctestlib.rst

@@ -7,7 +7,15 @@ This is a collection of generic tests that you can either run out-of-the-box by
 Scientific Applications
 -----------------------
 
-.. automodule:: hpctestlib.apps.amber.nve
+.. automodule:: hpctestlib.sciapps.amber.nve
+   :members:
+   :show-inheritance:
+
+
+Data Analytics
+--------------
+
+.. automodule:: hpctestlib.data_analytics.spark.spark_checks
    :members:
    :show-inheritance:
 
@@ -21,9 +29,9 @@ Python
 
 
 Interactive Computing
-----------------------
+---------------------
 
-.. automodule:: hpctestlib.apps.jupyter.ipcmagic
+.. automodule:: hpctestlib.interactive.jupyter.ipcmagic
    :members:
    :show-inheritance:
 

hpctestlib/data_analytics/spark/compute_pi/__init__.py renamed to hpctestlib/data_analytics/spark/spark_checks.py

@@ -35,7 +35,7 @@ class compute_pi_check(rfm.RunOnlyRegressionTest, pin_prefix=True):
 
     #: Parameter encoding the variant of the test.
     #:
-    #: :type:`str`
+    #: :type: :class:`str`
     #: :values: ``['spark', 'pyspark']``
     variant = parameter(['spark', 'pyspark'])
 

hpctestlib/data_analytics/spark/compute_pi/src/spark_pi.py renamed to hpctestlib/data_analytics/spark/src/spark_pi.py

@@ -2203,6 +2203,26 @@ def skip_if(self, cond, msg=None):
         if cond:
             self.skip(msg)
 
+    def skip_if_no_procinfo(self, msg=None):
+        '''Skip test if no processor topology information is available.
+
+        This method has effect only if called after the ``setup`` stage.
+
+        :arg msg: A message explaining why the test was skipped.
+            If not specified, a default message will be used.
+
+        .. versionadded:: 3.9.1
+        '''
+        if not self.current_partition:
+            return
+
+        proc = self.current_partition.processor
+        pname = self.current_partition.fullname
+        if msg is None:
+            msg = f'no topology information found for partition {pname!r}'
+
+        self.skip_if(not proc.info, msg)
+
     def __str__(self):
         return "%s(name='%s', prefix='%s')" % (type(self).__name__,
                                                self.name, self.prefix)

hpctestlib/sciapps/jupyter/ipcmagic/__init__.py renamed to hpctestlib/interactive/jupyter/ipcmagic/__init__.py

@@ -17,7 +17,7 @@
 from reframe.core.containers import _STAGEDIR_MOUNT
 from reframe.core.exceptions import (BuildError, PipelineError, ReframeError,
                                      PerformanceError, SanityError,
-                                     ReframeSyntaxError)
+                                     SkipTestError, ReframeSyntaxError)
 
 
 def _run(test, partition, prgenv):
@@ -1455,3 +1455,35 @@ def test_not_configured_container_platform(container_test, local_exec_ctx):
 
     with pytest.raises(PipelineError):
         _run(container_test(platform, 'ubuntu:18.04'), *local_exec_ctx)
+
+
+def test_skip_if_no_topo(HelloTest, local_exec_ctx):
+    class MyTest(HelloTest):
+        skip_message = variable(str, type(None), value=None)
+
+        @run_after('setup')
+        def access_topo(self):
+            self.skip_if_no_procinfo(self.skip_message)
+
+    class EchoTest(rfm.RunOnlyRegressionTest):
+        valid_systems = ['*']
+        valid_prog_environs = ['*']
+        executable = 'echo'
+        sanity_patterns = sn.assert_true(1)
+
+        @run_before('setup')
+        def access_topo(self):
+            self.skip_if_no_procinfo()
+
+    # The test should be skipped, because the auto-detection has not run
+    t = MyTest()
+    with pytest.raises(SkipTestError, match='no topology.*information'):
+        _run(t, *local_exec_ctx)
+
+    # Re-run to test that the custom message is used
+    t.skip_message = 'custom message'
+    with pytest.raises(SkipTestError, match='custom message'):
+        _run(t, *local_exec_ctx)
+
+    # This test should run to completion without problems
+    _run(EchoTest(), *local_exec_ctx)