Merge pull request reframe-hpc#3108 from vkarak/feat/implicit-partition-features

[feat] Include scheduler and launcher as default partition extras

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:
 
 

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.

unittests/test_config.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 == []