Merge branch 'develop' into jackm/cpu-vendor

Author: vkarak

docs/config_reference.rst

@@ -596,6 +596,7 @@ System Partition Configuration
    :default: ``[]``
 
    User defined features of the partition.
+
    These are accessible through the :attr:`~reframe.core.systems.SystemPartition.features` attribute of the :attr:`~reframe.core.pipeline.RegressionTest.current_partition` and can also be selected through the extended syntax of :attr:`~reframe.core.pipeline.RegressionTest.valid_systems`.
    The values of this list must be alphanumeric strings starting with a non-digit character and may also contain a ``-``.
 
@@ -608,11 +609,18 @@ System Partition Configuration
    :default: ``{}``
 
    User defined attributes of the partition.
+
    These are accessible through the :attr:`~reframe.core.systems.SystemPartition.extras` attribute of the :attr:`~reframe.core.pipeline.RegressionTest.current_partition` and can also be selected through the extended syntax of :attr:`~reframe.core.pipeline.RegressionTest.valid_systems`.
    The attributes of this object must be alphanumeric strings starting with a non-digit character and their values can be of any type.
 
+   By default, the values of the :attr:`~config.systems.partitions.scheduler` and :attr:`~config.systems.partitions.launcher` of the partition are added to the partition's extras, if not already present.
+
    .. versionadded:: 3.5.0
 
+   .. versionchanged:: 4.6.0
+
+      The default ``scheduler`` and ``launcher`` extras are added.
+
 .. _container-platform-configuration:
 
 

docs/manpage.rst

@@ -27,7 +27,7 @@ Test discovery and test loading
 This is the very first phase of the frontend.
 ReFrame will search for tests in its *check search path* and will load them.
 When ReFrame loads a test, it actually *instantiates* it, meaning that it will call its :func:`__init__` method unconditionally whether this test is meant to run on the selected system or not.
-This is something that writers of regression tests should bear in mind.
+This is something that test developers should bear in mind.
 
 .. option:: -c, --checkpath=PATH
 
@@ -45,6 +45,14 @@ This is something that writers of regression tests should bear in mind.
 
    This option can also be set using the :envvar:`RFM_CHECK_SEARCH_RECURSIVE` environment variable or the :attr:`~config.general.check_search_recursive` general configuration parameter.
 
+.. note::
+   ReFrame will fail to load a test with a relative import unless *any* of the following holds true:
+
+   1. The test is located under ReFrame's installation prefix.
+   2. The parent directory of the test contains an ``__init__.py`` file.
+
+   For versions prior to 4.6, relative imports are supported only for case (1).
+
 
 .. _test-filtering:
 

reframe/core/systems.py

@@ -189,6 +189,12 @@ def __init__(self, *, parent, name, sched_type, launcher_type,
         self._features = features
         self._time_limit = time_limit
 
+        # Add implicit extras from scheduler and launcher
+        sched_name = self._sched_type.registered_name
+        launcher_name = self._launcher_type.registered_name
+        self._extras.setdefault('scheduler', sched_name)
+        self._extras.setdefault('launcher', launcher_name)
+
     @property
     def access(self):
         '''The scheduler options for accessing this system partition.

reframe/frontend/loader.py

@@ -195,8 +195,15 @@ def load_from_file(self, filename, force=False):
             dirname = os.path.dirname(filename)
             with osext.change_dir(dirname):
                 with util.temp_sys_path(dirname):
+                    if os.path.exists(os.path.join(dirname, '__init__.py')):
+                        # If the containing directory is a package,
+                        # import it, too.
+                        parent = util.import_module_from_file(dirname).__name__
+                    else:
+                        parent = None
+
                     return self.load_from_module(
-                        util.import_module_from_file(filename, force)
+                        util.import_module_from_file(filename, force, parent)
                     )
         except Exception:
             exc_info = sys.exc_info()

reframe/utility/__init__.py

@@ -70,7 +70,7 @@ def _do_import_module_from_file(filename, module_name=None):
     return module
 
 
-def import_module_from_file(filename, force=False):
+def import_module_from_file(filename, force=False, parent=None):
     '''Import module from file.
 
     If the file location refers to a directory, the contained ``__init__.py``
@@ -85,7 +85,14 @@ def import_module_from_file(filename, force=False):
 
     :arg filename: The path to the filename of a Python module.
     :arg force: Force reload of module in case it is already loaded.
+    :arg parent: The name of the parent module of the one that will be loaded.
+        This will essentially prefix the module of the newly loaded module with
+        ``parent`` so that Python would be able to resolve relative imports in
+        the module file.
     :returns: The loaded Python module.
+
+    .. versionchanged:: 4.6
+       The ``parent`` argument is added.
     '''
 
     # Expand and sanitize filename
@@ -103,6 +110,9 @@ def import_module_from_file(filename, force=False):
         # with other modules loaded with a standard `import` or with multiple
         # test files with the same name that reside in different directories.
         module_hash = sha256(filename.encode('utf-8')).hexdigest()[:8]
+        if parent:
+            module_name = f'{parent}.{module_name}'
+
         module_name = f'{module_name}@{module_hash}'
         return _do_import_module_from_file(filename, module_name)
 

unittests/resources/checks_unlisted/testlib/__init__.py

@@ -5,21 +5,17 @@
 
 import reframe as rfm
 import reframe.utility.sanity as sn
-
-
-class dummy_fixture(rfm.RunOnlyRegressionTest, pin_prefix=True):
-    executable = 'echo'
-    sanity_patterns = sn.assert_true(1)
+from .utility import dummy_fixture
 
 
 @rfm.simple_test
-class simple_echo_check(rfm.RunOnlyRegressionTest):
+class simple_echo_check(rfm.RunOnlyRegressionTest, pin_prefix=True):
     descr = 'Simple Echo Test'
     valid_systems = ['*']
     valid_prog_environs = ['builtin']
     executable = 'echo'
     executable_opts = ['Hello']
-    message = variable(str, value='World') 
+    message = variable(str, value='World')
     dummy = fixture(dummy_fixture, scope='environment')
 
     @run_before('run')

unittests/resources/checks_unlisted/testlib/simple.py

@@ -0,0 +1,7 @@
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+
+class dummy_fixture(rfm.RunOnlyRegressionTest):
+    executable = 'echo'
+    sanity_patterns = sn.assert_true(1)

unittests/resources/checks_unlisted/testlib/utility/__init__.py

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import reframe as rfm
-
 from testlib.simple import simple_echo_check
 
 

unittests/resources/checks_unlisted/testlib_inheritance_foo.py

@@ -436,6 +436,16 @@ def test_system_create(site_config):
     assert partition.local_env.env_vars == {'FOO_GPU': 'yes'}
     assert partition.max_jobs == 10
     assert partition.time_limit is None
+
+    # Check partition extras and features
+    assert partition.features == ['cuda', 'mpi']
+    assert partition.extras == {
+        'gpu_arch': 'a100',
+        'scheduler': 'slurm',
+        'launcher': 'srun'
+    }
+
+    # Check partition environments
     assert len(partition.environs) == 2
     assert partition.environment('PrgEnv-gnu').cc == 'cc'
     assert partition.environment('PrgEnv-gnu').cflags == []