Load SYSTEM modules by short name

No need to use the full name for e.g. GCCcore/GCC which are in Core/GCC.

Author: Flamefire

easybuild/tools/toolchain/toolchain.py

@@ -689,8 +689,13 @@ def _load_dependencies_modules(self, silent=False):
         """Load modules for dependencies, and handle special cases like external modules."""
         # For SYSTEM software we allow using dependencies from any toolchain so we need to use the full
         # module name to allow loading them in the hierarchical MNS
-        mod_name_key = 'full_mod_name' if self.is_system_toolchain() else 'short_mod_name'
-        dep_mods = [dep[mod_name_key] for dep in self.dependencies]
+        is_system_toolchain = self.is_system_toolchain()
+
+        def get_module_name(dep):
+            key = 'full_mod_name' if is_system_toolchain and not dep[SYSTEM_TOOLCHAIN_NAME] else 'short_mod_name'
+            return dep[key]
+
+        dep_mods = [get_module_name(dep) for dep in self.dependencies]
 
         if self.dry_run:
             dry_run_msg("\nLoading modules for dependencies...\n", silent=silent)
@@ -699,7 +704,7 @@ def _load_dependencies_modules(self, silent=False):
 
             # load available modules for dependencies, simulate load for others
             for dep, dep_mod_exists in zip(self.dependencies, mods_exist):
-                mod_name = dep[mod_name_key]
+                mod_name = get_module_name(dep)
                 if dep_mod_exists:
                     self.modules_tool.load([mod_name])
                     dry_run_msg("module load %s" % mod_name, silent=silent)
@@ -715,15 +720,15 @@ def _load_dependencies_modules(self, silent=False):
             self.modules_tool.load(dep_mods)
 
             if self.dependencies:
-                build_dep_mods = [dep[mod_name_key] for dep in self.dependencies if dep['build_only']]
+                build_dep_mods = [get_module_name(dep) for dep in self.dependencies if dep['build_only']]
                 if build_dep_mods:
                     trace_msg("loading modules for build dependencies:")
                     for dep_mod in build_dep_mods:
                         trace_msg(' * ' + dep_mod)
                 else:
                     trace_msg("(no build dependencies specified)")
 
-                run_dep_mods = [dep[mod_name_key] for dep in self.dependencies if not dep['build_only']]
+                run_dep_mods = [get_module_name(dep) for dep in self.dependencies if not dep['build_only']]
                 if run_dep_mods:
                     trace_msg("loading modules for (runtime) dependencies:")
                     for dep_mod in run_dep_mods:
@@ -784,7 +789,7 @@ def _verify_toolchain(self):
         self.log.debug("List of toolchain dependencies from toolchain module: %s", self.toolchain_dep_mods)
 
         # only retain names of toolchain elements, excluding toolchain name
-        toolchain_definition = {e for es in self.definition().values() for e in es if not e == self.name}
+        toolchain_definition = {e for es in self.definition().values() for e in es if e != self.name}
 
         # filter out optional toolchain elements if they're not used in the module
         for elem_name in toolchain_definition.copy():