Merge branch 'easybuilders:develop' into 20250604092520_new_pr_llvm

Author: Flamefire

easybuild/easyblocks/l/llvm.py

@@ -1082,11 +1082,11 @@ def _para_test_step(self, parallel=1):
         basedir = self.final_dir
 
         # From grep -E "^[A-Z]+: " LOG_FILE | cut -d: -f1 | sort | uniq
-        OUTCOMES_LOG = [
+        OUTCOME_FAIL = [
             'FAIL',
             'TIMEOUT',
         ]
-        # OUTCOMES_OK = [
+        # OUTCOME_OK = [
         #     'PASS',
         #     'UNSUPPORTED',
         #     'XFAIL',
@@ -1114,7 +1114,7 @@ def _para_test_step(self, parallel=1):
         failed_pattern_matches = 0
         if ignore_patterns:
             for line in out.splitlines():
-                if any(line.startswith(f'{x}: ') for x in OUTCOMES_LOG):
+                if any(line.startswith(f'{x}: ') for x in OUTCOME_FAIL):
                     if any(patt in line for patt in ignore_patterns):
                         self.log.info("Ignoring test failure: %s", line)
                         ignored_pattern_matches += 1
@@ -1144,7 +1144,7 @@ def _para_test_step(self, parallel=1):
 
         if num_failed != failed_pattern_matches:
             msg = f"Number of failed tests ({num_failed}) does not match "
-            msg += f"number identified va line-by-line pattern matching: {failed_pattern_matches}"
+            msg += f"Number identified via line-by-line pattern matching: {failed_pattern_matches}"
             self.log.warning(msg)
 
         if num_failed is not None and ignored_pattern_matches:
@@ -1160,15 +1160,14 @@ def test_step(self):
             self._create_compiler_config_file(self.final_dir)
 
             # For nvptx64 tests, find out if 'ptxas' exists in $PATH. If not, ignore all nvptx64 test failures
-            pxtas_path = which('ptxas', on_error=IGNORE)
-            if self.nvptx_target_cond and not pxtas_path:
+            if not which('ptxas', on_error=IGNORE):
                 self.ignore_patterns += ['nvptx64-nvidia-cuda', 'nvptx64-nvidia-cuda-LTO']
                 self.log.warning("PTXAS not found in PATH, ignoring failing tests for NVPTX target")
             # If the AMDGPU target is built, tests will be run if libhsa-runtime64.so is found.
             # However, this can cause issues if the system libraries are used, due to other loaded modules.
             # Therefore, ignore failing tests if ROCr-Runtime is not in the dependencies and
             # warn about this in the logs.
-            if self.amdgpu_target_cond and 'rocr-runtime' not in self.deps:
+            if 'rocr-runtime' not in self.deps:
                 self.ignore_patterns += ['amdgcn-amd-amdhsa']
                 self.log.warning("ROCr-Runtime not in dependencies, ignoring failing tests for AMDGPU target.")
 

easybuild/easyblocks/m/mpich.py

@@ -137,9 +137,20 @@ def add_mpich_configopts(self):
                     device, ', '.join(DEVICES_WITH_UCX_SUPPORT)
                 )
             device += ':ucx'
-            add_configopts.append('--with-ucx=%s' % ucx_root)
+            add_configopts.append(f'--with-ucx={ucx_root}')
             self.log.info("Enabling UCX support, using UCX root: %s", ucx_root)
 
+        hwloc_root = get_software_root('hwloc')
+        if hwloc_root:
+            if LooseVersion(self.version) < LooseVersion('4'):
+                add_configopts.append(f'--with-hwloc-prefix={hwloc_root}')
+            else:
+                add_configopts.append(f'--with-hwloc={hwloc_root}')
+            self.log.info("Enabling hwloc support, using hwloc root: %s", hwloc_root)
+        else:
+            add_configopts.append('--without-hwloc')
+            self.log.info("hwloc dependency not found, disabling hwloc support")
+
         if self.cfg['mpi_abi']:
             if LooseVersion(self.version) < LooseVersion('4.3'):
                 raise EasyBuildError("MPI ABI compatibility is not supported in MPICH < 4.3")