Merge branch 'master' of https://github.com/eth-cscs/reframe into bugfix/var_options_type

Author: ekouts

cscs-checks/microbenchmarks/cpu/latency/latency.py

@@ -12,7 +12,7 @@ class CPULatencyTest(rfm.RegressionTest):
     sourcepath = 'latency.cpp'
     build_system = 'SingleSource'
     valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
-                     'ault:intel', 'ault:amdvega', 'tave:compute']
+                     'ault:intel', 'ault:amdvega', 'eiger:mc', 'pilatus:mc']
     valid_prog_environs = ['PrgEnv-gnu']
     num_tasks = 0
     num_tasks_per_node = 1
@@ -54,11 +54,17 @@ class CPULatencyTest(rfm.RegressionTest):
             'latencyL3':  (14.4, -0.01, 0.26, 'ns'),
             'latencyMem': (90.0, -0.01, 0.05, 'ns')
         },
-        'tave:compute': {
-            'latencyL1':  (2.86, -0.01, 0.05, 'ns'),
-            'latencyL2':  (12.15, -0.01, 0.05, 'ns'),
-            'latencyL3':  (137, -0.01, 0.05, 'ns'),
-            'latencyMem': (150, -0.05, 0.05, 'ns')
+        'eiger:mc': {
+            'latencyL1':  (1.19, -0.02, 0.05, 'ns'),
+            'latencyL2':  (3.40, -0.03, 0.05, 'ns'),
+            'latencyL3':  (11.5, -0.05, 0.05, 'ns'),
+            'latencyMem': (105, -0.05, 0.05, 'ns')
+        },
+        'pilatus:mc': {
+            'latencyL1':  (1.19, -0.02, 0.05, 'ns'),
+            'latencyL2':  (3.40, -0.03, 0.05, 'ns'),
+            'latencyL3':  (11.5, -0.05, 0.05, 'ns'),
+            'latencyMem': (105, -0.05, 0.05, 'ns')
         },
     }
     maintainers = ['SK']
@@ -68,8 +74,6 @@ class CPULatencyTest(rfm.RegressionTest):
     def set_modules(self):
         if self.current_system.name in {'daint', 'dom'}:
             self.modules = ['craype-hugepages1G']
-        if self.current_system.name in {'tave'}:
-            self.modules = ['craype-hugepages512M']
 
     @run_before('compile')
     def set_flags(self):

docs/regression_test_api.rst

@@ -670,7 +670,6 @@ Therefore, classes that derive from the base :class:`~reframe.core.pipeline.Regr
 .. automethod:: reframe.core.pipeline.RegressionMixin.variant_name
 
 
-
 ------------------------
 Environments and Systems
 ------------------------

docs/requirements.txt

@@ -2,5 +2,5 @@ archspec==0.1.3
 docutils==0.16 # https://github.com/sphinx-doc/sphinx/issues/9001
 jsonschema==3.2.0
 semver==2.13.0
-Sphinx==4.3.2
+Sphinx==4.4.0
 sphinx-rtd-theme==1.0.0

reframe/core/meta.py

@@ -832,13 +832,12 @@ def fixture_space(cls):
     def is_abstract(cls):
         '''Check if the class is an abstract test.
 
-        This is the case when some parameters are undefined, which results in
-        the length of the parameter space being 0.
+        A test is considered abstract if any of its direct or indirect
+        parameters (inherited from a base class or from a fixture) is
+        undefined.
 
-        :return: bool indicating whether the test or any of its fixtures has
-          undefined parameters.
+        :returns: :obj:`True` if the test is abstract, :obj:`False` otherwise.
 
-        :meta private:
         '''
         return cls.num_variants == 0
 
@@ -908,6 +907,8 @@ class HelloTest(rfm.RunOnlyRegressionTest):
     :param kwargs: Any keyword arguments to be passed to the
         :class:`RegressionTestMeta` metaclass.
 
+    .. versionadded:: 3.10.0
+
     '''
     namespace = RegressionTestMeta.__prepare__(name, bases, **kwargs)
     namespace.update(body)

reframe/core/pipeline.py

@@ -1166,6 +1166,26 @@ def fixture_variant(self):
         '''
         return getattr(self, '_rfm_fixt_variant', None)
 
+    def set_var_default(self, name, value):
+        '''Set the default value of a variable if variable is undefined.
+
+        A variable is undefined if it is declared and required and no value is
+        yet assigned to it.
+
+        :param name: The name of the variable.
+        :param value: The value to set the variable to.
+        :raises ValueError: If the variable does not exist
+
+        .. versionadded:: 3.10.1
+
+        '''
+        var_space = type(self).var_space
+        if name not in var_space:
+            raise ValueError(f'no such variable: {name!r}')
+
+        if not var_space[name].is_defined():
+            setattr(self, name, value)
+
     @property
     def perfvalues(self):
         return util.MappingView(self._perfvalues)

reframe/frontend/executors/policies.py

@@ -579,7 +579,8 @@ def on_task_compile_exit(self, task):
         pass
 
     def on_task_skip(self, task):
-        pass
+        msg = str(task.exc_info[1])
+        self.printer.status('SKIP', msg, just='right')
 
     def on_task_failure(self, task):
         self._num_failed_tasks += 1

reframe/utility/__init__.py

@@ -678,7 +678,7 @@ def _is_valid_for_env(m, e):
     for p in current_system.partitions:
         for e in p.environs:
             rt.loadenv(p.local_env, e)
-            modules = ms.available_modules(substr)
+            modules = OrderedSet(ms.available_modules(substr))
             snap0.restore()
             for m in modules:
                 if _is_valid_for_env(m, e.name):

requirements.txt

@@ -1,6 +1,6 @@
 # rfmdocstart: required-packages
 archspec==0.1.3
-argcomplete==1.12.3
+argcomplete==2.0.0
 coverage==6.2
 importlib_metadata==4.0.1; python_version < '3.8'
 jsonschema==3.2.0
@@ -9,7 +9,7 @@ pytest==6.2.5
 pytest-forked==1.4.0
 pytest-parallel==0.1.1
 PyYAML==6.0
-requests==2.26.0
+requests==2.27.1
 semver==2.13.0
 setuptools==59.6.0
 wcwidth==0.2.5

unittests/test_pipeline.py

@@ -1527,6 +1527,24 @@ def validate(self):
     _run(hello_cls(), *local_exec_ctx)
 
 
+def test_set_var_default():
+    class _X(rfm.RunOnlyRegressionTest):
+        foo = variable(int, value=10)
+        bar = variable(int)
+
+        @run_after('init')
+        def set_defaults(self):
+            self.set_var_default('foo', 100)
+            self.set_var_default('bar', 100)
+
+            with pytest.raises(ValueError):
+                self.set_var_default('foobar', 10)
+
+    x = _X()
+    assert x.foo == 10
+    assert x.bar == 100
+
+
 def test_set_name_deprecation():
     from reframe.core.warnings import ReframeDeprecationWarning
 

unittests/test_utility.py

@@ -1450,16 +1450,24 @@ def user_exec_ctx(request, make_exec_ctx_g):
 
 
 @pytest.fixture
-def modules_system(user_exec_ctx, monkeypatch):
+def modules_system(user_exec_ctx, monkeypatch, tmp_path):
     # Pretend to be on a clean modules environment
     monkeypatch.setenv('MODULEPATH', '')
     monkeypatch.setenv('LOADEDMODULES', '')
     monkeypatch.setenv('_LMFILES_', '')
 
+    # Create a symlink to testmod_foo to check for unique module names
+    # found by `find_modules`
+    (tmp_path / 'testmod_foo').symlink_to(
+        os.path.join(test_util.TEST_MODULES, 'testmod_foo')
+    )
+
     ms = rt.runtime().system.modules_system
+    ms.searchpath_add(str(tmp_path))
     ms.searchpath_add(test_util.TEST_MODULES)
     yield ms
     ms.searchpath_remove(test_util.TEST_MODULES)
+    ms.searchpath_remove(str(tmp_path))
 
 
 def test_find_modules(modules_system):