Small refactoring and add docs

reframe-hpc · Nov 30, 2023 · 28863cf · 28863cf
1 parent 5641948
commit 28863cf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/docs/config_reference.rst b/docs/config_reference.rst
@@ -1749,6 +1749,11 @@ General Configuration
 
    .. versionadded:: 3.6.0
 
+   .. versionchanged:: 4.5.0
+
+      When the module conflict resolution is off, ReFrame will not check if the module system is available and sane where it is running.
+      It will only emit the module commands in the build and run scripts.
+
 
 .. py:attribute:: general.save_log_files
 

diff --git a/docs/manpage.rst b/docs/manpage.rst
@@ -1632,6 +1632,11 @@ Whenever an environment variable is associated with a configuration option, its
 
    .. versionadded:: 3.6.0
 
+   .. versionchanged:: 4.5.0
+
+      When the module conflict resolution is off, ReFrame will not check if the module system is available and sane where it is running.
+      It will only emit the module commands in the build and run scripts.
+
    .. table::
       :align: left
 

diff --git a/reframe/core/systems.py b/reframe/core/systems.py
@@ -461,14 +461,14 @@ class System(jsonext.JSONSerializable):
     '''
 
     def __init__(self, name, descr, hostnames, modules_system,
-                 preload_env, prefix, outputdir,
-                 resourcesdir, stagedir, partitions, module_resolution):
+                 modules_system_validate, preload_env, prefix, outputdir,
+                 resourcesdir, stagedir, partitions):
         getlogger().debug(f'Initializing system {name!r}')
         self._name = name
         self._descr = descr
         self._hostnames = hostnames
         self._modules_system = ModulesSystem.create(modules_system,
-                                                    module_resolution)
+                                                    modules_system_validate)
         self._preload_env = preload_env
         self._prefix = prefix
         self._outputdir = outputdir
@@ -582,6 +582,9 @@ def create(cls, site_config):
             descr=site_config.get('systems/0/descr'),
             hostnames=site_config.get('systems/0/hostnames'),
             modules_system=site_config.get('systems/0/modules_system'),
+            modules_system_validate=site_config.get(
+                'general/resolve_module_conflicts'
+            ),
             preload_env=Environment(
                 name=f'__rfm_env_{sysname}',
                 modules=site_config.get('systems/0/modules'),
@@ -591,10 +594,7 @@ def create(cls, site_config):
             outputdir=site_config.get('systems/0/outputdir'),
             resourcesdir=site_config.get('systems/0/resourcesdir'),
             stagedir=site_config.get('systems/0/stagedir'),
-            partitions=partitions,
-            module_resolution=site_config.get(
-                'general/resolve_module_conflicts'
-            )
+            partitions=partitions
         )
 
     @property