zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes openmpi configure args for multinode execution on slurm (#38403)

Browse Source 
Remove `--enable-mca-no-build=btl-uct` check for ucx spec
as it is already fixed in the openmpi open-mpi/ompi#6666
This commit is contained in:
Gurkirat Singh
2023-06-24 14:10:43 +05:30
committed by GitHub
parent 09d9b48957
commit d99892e490
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
var/spack/repos/builtin/packages/openmpi/package.py
View File

@@ -494,6 +494,7 @@ class Openmpi(AutotoolsPackage, CudaPackage):
) )
# Variants to use internal packages # Variants to use internal packages
variant("internal-hwloc", default=False, description="Use internal hwloc") variant("internal-hwloc", default=False, description="Use internal hwloc")
variant("internal-pmix", default=False, description="Use internal pmix")
provides("mpi") provides("mpi")
provides("mpi@:2.2", when="@1.6.5") provides("mpi@:2.2", when="@1.6.5")
@@ -552,9 +553,9 @@ class Openmpi(AutotoolsPackage, CudaPackage):
# OpenMPI @2: includes a vendored version: # OpenMPI @2: includes a vendored version:
# depends_on('pmix@1.1.2', when='@2.1.6') # depends_on('pmix@1.1.2', when='@2.1.6')
# depends_on('pmix@3.2.3', when='@4.1.2') # depends_on('pmix@3.2.3', when='@4.1.2')
depends_on("pmix@1.0:1", when="@2.0:2") depends_on("pmix@1.0:1", when="@2.0:2 ~internal-pmix")
depends_on("pmix@3.2:", when="@4.0:4") depends_on("pmix@3.2:", when="@4.0:4 ~internal-pmix")
depends_on("pmix@4.2:", when="@5.0:5") depends_on("pmix@4.2:", when="@5.0:5 ~internal-pmix")
# Libevent is required when *vendored* PMIx is used # Libevent is required when *vendored* PMIx is used
depends_on("libevent@2:", when="@main") depends_on("libevent@2:", when="@main")
@@ -959,13 +960,22 @@ def configure_args(self):
config_args.extend(["--enable-debug"]) config_args.extend(["--enable-debug"])
# Package dependencies # Package dependencies
for dep in ["libevent", "lustre", "pmix", "singularity", "valgrind", "zlib"]: for dep in ["libevent", "lustre", "singularity", "valgrind", "zlib"]:
if "^" + dep in spec: if "^" + dep in spec:
config_args.append("--with-{0}={1}".format(dep, spec[dep].prefix)) config_args.append("--with-{0}={1}".format(dep, spec[dep].prefix))
# PMIx support
if spec.satisfies("+internal-pmix"):
config_args.append("--with-pmix=internal")
elif "^pmix" in spec:
config_args.append("--with-pmix={0}".format(spec["pmix"].prefix))
# Hwloc support # Hwloc support
if "^hwloc" in spec: if spec.satisfies("+internal-hwloc"):
config_args.append("--with-hwloc=internal")
elif "^hwloc" in spec:
config_args.append("--with-hwloc=" + spec["hwloc"].prefix) config_args.append("--with-hwloc=" + spec["hwloc"].prefix)
# Java support # Java support
if "+java" in spec: if "+java" in spec:
config_args.extend( config_args.extend(