summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/spack/spack/build_systems/cached_cmake.py2
-rw-r--r--var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py4
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/spack/spack/build_systems/cached_cmake.py b/lib/spack/spack/build_systems/cached_cmake.py
index 8d3d10a208..ca9eae52b4 100644
--- a/lib/spack/spack/build_systems/cached_cmake.py
+++ b/lib/spack/spack/build_systems/cached_cmake.py
@@ -199,6 +199,8 @@ class CachedCMakeBuilder(CMakeBuilder):
mpiexec = "/usr/bin/srun"
else:
mpiexec = os.path.join(spec["slurm"].prefix.bin, "srun")
+ elif hasattr(spec["mpi"].package, "mpiexec"):
+ mpiexec = spec["mpi"].package.mpiexec
else:
mpiexec = os.path.join(spec["mpi"].prefix.bin, "mpirun")
if not os.path.exists(mpiexec):
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py
index 14743bfc8f..ab3c438bdf 100644
--- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py
+++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py
@@ -114,6 +114,10 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage):
provides("mpi@:3.1")
@property
+ def mpiexec(self):
+ return self.component_prefix.bin.mpiexec
+
+ @property
def v2_layout_versions(self):
return "@2021.11:"