From 9f1223e7a35fb2a6565b493fcce41e013ee3be1f Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 7 Dec 2023 13:06:07 -0600 Subject: Bugfix spectrum-mpi module generation (#41466) * Ensure that additional environment variables are set when a module file is generated. * Fixed the detection of the opal_prefix / MPI_ROOT field to use ompi_info. --------- Co-authored-by: Greg Becker --- .../repos/builtin/packages/spectrum-mpi/package.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index ea5c29d322..8b4efee5ff 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -56,6 +56,14 @@ class SpectrumMpi(BundlePackage): break return actual_compiler.spec if actual_compiler else None + def get_opal_prefix(exe): + output = Executable(exe)(output=str, error=str) + match = re.search(r"Prefix: (\S+)", output) + if not match: + return None + opal_prefix = match.group(1) + return opal_prefix + results = [] for exe in exes: dirname = os.path.dirname(exe) @@ -83,9 +91,14 @@ class SpectrumMpi(BundlePackage): # results.append((variant, {'compilers': compilers_found})) # # Otherwise, use this simpler attribute - results.append(variant) else: - results.append("") + variant = "" + opal_prefix = get_opal_prefix(exe) + if opal_prefix: + extra_attributes = {"opal_prefix": opal_prefix} + results.append((variant, extra_attributes)) + else: + results.append(variant) return results def setup_dependent_package(self, module, dependent_spec): @@ -148,3 +161,6 @@ class SpectrumMpi(BundlePackage): env.set("MPICXX", os.path.join(self.prefix.bin, "mpic++")) env.set("MPIF77", os.path.join(self.prefix.bin, "mpif77")) env.set("MPIF90", os.path.join(self.prefix.bin, "mpif90")) + + env.set("OPAL_PREFIX", self.spec.extra_attributes.get("opal_prefix", self.prefix)) + env.set("MPI_ROOT", self.spec.extra_attributes.get("opal_prefix", self.prefix)) -- cgit v1.2.3-70-g09d2