summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Bernede <51493078+adrienbernede@users.noreply.github.com>2024-03-14 21:49:09 +0100
committerGitHub <noreply@github.com>2024-03-14 14:49:09 -0600
commit102811adb9a024c791e3f7312294b0cfafea2337 (patch)
treea1ed1151052c8797f144c7936d2ff6f9d532943d
parent8f56eb620f0ec6d2dc3d73f442d6eeb7ed986558 (diff)
downloadspack-102811adb9a024c791e3f7312294b0cfafea2337.tar.gz
spack-102811adb9a024c791e3f7312294b0cfafea2337.tar.bz2
spack-102811adb9a024c791e3f7312294b0cfafea2337.tar.xz
spack-102811adb9a024c791e3f7312294b0cfafea2337.zip
Fix Axom: index out of range when configuring axom~mpi on toss_4 (#43186)
-rw-r--r--var/spack/repos/builtin/packages/axom/package.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py
index 1c64ad7093..6d1efb4c94 100644
--- a/var/spack/repos/builtin/packages/axom/package.py
+++ b/var/spack/repos/builtin/packages/axom/package.py
@@ -415,21 +415,21 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
entries.append(cmake_cache_option("ENABLE_MPI", True))
if spec["mpi"].name == "spectrum-mpi":
entries.append(cmake_cache_string("BLT_MPI_COMMAND_APPEND", "mpibind"))
+
+ # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4
+ # TODO: Remove this logic by adding `using_flux` case in
+ # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded
+ # path to srun in same file.
+ if "toss_4" in self._get_sys_type(spec):
+ srun_wrapper = which_string("srun")
+ mpi_exec_index = [
+ index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry
+ ]
+ del entries[mpi_exec_index[0]]
+ entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper))
else:
entries.append(cmake_cache_option("ENABLE_MPI", False))
- # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4
- # TODO: Remove this logic by adding `using_flux` case in
- # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded
- # path to srun in same file.
- if "toss_4" in self._get_sys_type(spec):
- srun_wrapper = which_string("srun")
- mpi_exec_index = [
- index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry
- ]
- del entries[mpi_exec_index[0]]
- entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper))
-
return entries
def find_path_replacement(self, path1, path2, path_replacements, name, entries):