From 78abe968a0b30a57cc4be4577c0ee18cc8fa7e04 Mon Sep 17 00:00:00 2001 From: MatthewLieber <77356607+MatthewLieber@users.noreply.github.com> Date: Mon, 17 Mar 2025 04:38:19 -0400 Subject: [PATCH] mvapich: add v4.0 and update default pmi version (#49399) Co-authored-by: Matt Lieber --- var/spack/repos/builtin/packages/mvapich/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/mvapich/package.py b/var/spack/repos/builtin/packages/mvapich/package.py index e5732d2cd90..9ee8d2a9030 100644 --- a/var/spack/repos/builtin/packages/mvapich/package.py +++ b/var/spack/repos/builtin/packages/mvapich/package.py @@ -26,6 +26,7 @@ class Mvapich(MpichEnvironmentModifications, AutotoolsPackage): license("Unlicense") # Prefer the latest stable release + version("4.0", sha256="c532f7bdd5cca71f78c12e0885c492f6e276e283711806c84d0b0f80bb3e3b74") version("3.0", sha256="ee076c4e672d18d6bf8dd2250e4a91fa96aac1db2c788e4572b5513d86936efb") depends_on("c", type="build") @@ -67,8 +68,8 @@ class Mvapich(MpichEnvironmentModifications, AutotoolsPackage): variant( "pmi_version", description="Which pmi version to be used. If using pmi2 add it to your CFLAGS", - default="simple", - values=("simple", "pmi2", "pmix"), + default="none", + values=("none", "pmi1", "pmi2", "pmix"), multi=False, ) @@ -163,7 +164,6 @@ def process_manager_options(self): if "process_managers=slurm" in spec: opts = [ "--with-pm=slurm", - "--with-pmi=simple", "--with-slurm={0}".format(spec["slurm"].prefix), "CFLAGS=-I{0}/include/slurm".format(spec["slurm"].prefix), ] @@ -231,7 +231,8 @@ def configure_args(self): ] args.extend(self.enable_or_disable("alloca")) - args.append("--with-pmi=" + spec.variants["pmi_version"].value) + if not spec.satisfies("pmi_version=none"): + args.append("--with-pmi=" + spec.variants["pmi_version"].value) if "pmi_version=pmix" in spec: args.append("--with-pmix={0}".format(spec["pmix"].prefix))