Fix handling of (max_)parallel for extensions

When copying an EC we need to copy the parallel property too.
When instantiating an extension we need to check the `max_parallel`
again in case it was set in the extension options.

Author: Flamefire

easybuild/framework/easyblock.py

@@ -2422,7 +2422,7 @@ def set_parallel(self):
             else:
                 par = min(int(par), int(cfg_par))
 
-        par = det_parallelism(par, maxpar=self.cfg['maxparallel'])
+        par = det_parallelism(par, maxpar=self.cfg['max_parallel'])
         self.log.info("Setting parallelism: %s" % par)
         self.cfg.parallel = par
 

easybuild/framework/easyconfig/easyconfig.py

@@ -615,6 +615,7 @@ def copy(self, validate=None):
         ec = EasyConfig(self.path, validate=validate, hidden=self.hidden, rawtxt=self.rawtxt)
         # take a copy of the actual config dictionary (which already contains the extra options)
         ec._config = copy.deepcopy(self._config)
+        ec._parallel = self._parallel  # Might be already set, e.g. for extensions
         # since rawtxt is defined, self.path may not get inherited, make sure it does
         if self.path:
             ec.path = self.path
@@ -721,7 +722,7 @@ def parse(self):
 
         if 'parallel' in ec_vars:
             # Replace value and issue better warning for EC params (as opposed to warnings meant for easyblocks)
-            self.log.deprecated("Easyconfig parameter 'parallel' is deprecated, use 'maxparallel' instead.", '5.1')
+            self.log.deprecated("Easyconfig parameter 'parallel' is deprecated, use 'max_parallel' instead.", '5.1')
             ec_vars['_parallelLegacy'] = ec_vars.pop('parallel')
 
         # provide suggestions for typos. Local variable names are excluded from this check

easybuild/framework/extension.py

@@ -132,6 +132,10 @@ def __init__(self, mself, ext, extra_params=None):
         self.options = resolve_template(copy.deepcopy(self.ext.get('options', {})),
                                         self.cfg.template_values,
                                         expect_resolved=False)
+        if 'parallel' in self.options:
+            # Replace value and issue better warning for EC params (as opposed to warnings meant for easyblocks)
+            self.log.deprecated("Easyconfig parameter 'parallel' is deprecated, use 'max_parallel' instead.", '5.1')
+            self.options['max_parallel'] = self.options.pop('parallel')
 
         if extra_params:
             self.cfg.extend_params(extra_params, overwrite=False)
@@ -149,6 +153,11 @@ def __init__(self, mself, ext, extra_params=None):
                 self.log.debug("Skipping unknown custom easyconfig parameter '%s' for extension %s/%s: %s",
                                key, name, version, value)
 
+        # Take potentially new value into account
+        max_par = self.cfg['max_parallel']
+        if max_par is not None and max_par < self.cfg.parallel:
+            self.cfg.parallel = max_par
+
         self.sanity_check_fail_msgs = []
         self.sanity_check_module_loaded = False
         self.fake_mod_data = None