From 0b3c1d9bc2cc2b5cc254f19a2488b5f6c0b375bd Mon Sep 17 00:00:00 2001 From: Artem Polyakov Date: Tue, 20 Apr 2021 08:55:59 -0700 Subject: [PATCH 1/2] pmix/pmix3x: Fix internal PMIx discovery logic. See https://github.com/open-mpi/ompi/issues/8823 for the details. Signed-off-by: Artem Polyakov --- opal/mca/pmix/pmix3x/pmix3x_component.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opal/mca/pmix/pmix3x/pmix3x_component.c b/opal/mca/pmix/pmix3x/pmix3x_component.c index 7770ff8243f..a086e7e9c12 100644 --- a/opal/mca/pmix/pmix3x/pmix3x_component.c +++ b/opal/mca/pmix/pmix3x/pmix3x_component.c @@ -144,8 +144,7 @@ static int external_component_query(mca_base_module_t **module, int *priority) char *t, *id; /* see if a PMIx server is present */ - if (NULL != (t = getenv("PMIX_SERVER_URI")) || - NULL != (id = getenv("PMIX_ID"))) { + if (NULL != (t = getenv("PMIX_NAMESPACE"))) { /* if PMIx is present, then we are a client and need to use it */ *priority = 100; } else { From 2210251b591b55d34e683cde222f5b5464ad7007 Mon Sep 17 00:00:00 2001 From: Artem Polyakov Date: Tue, 20 Apr 2021 11:48:45 -0700 Subject: [PATCH 2/2] pmix: Fix detection of Externally-built PMIx See https://github.com/open-mpi/ompi/issues/8823 for more details. Signed-off-by: Artem Polyakov --- opal/mca/pmix/ext1x/pmix1x_component.c | 3 +-- opal/mca/pmix/ext2x/ext2x_component.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/opal/mca/pmix/ext1x/pmix1x_component.c b/opal/mca/pmix/ext1x/pmix1x_component.c index 87932116705..fec3d89874c 100644 --- a/opal/mca/pmix/ext1x/pmix1x_component.c +++ b/opal/mca/pmix/ext1x/pmix1x_component.c @@ -128,8 +128,7 @@ static int external_component_query(mca_base_module_t **module, int *priority) char *t, *id; /* see if a PMIx server is present */ - if (NULL != (t = getenv("PMIX_SERVER_URI")) || - NULL != (id = getenv("PMIX_ID"))) { + if (NULL != (t = getenv("PMIX_NAMESPACE"))) { /* if PMIx is present, then we are a client and need to use it */ *priority = 100; } else { diff --git a/opal/mca/pmix/ext2x/ext2x_component.c b/opal/mca/pmix/ext2x/ext2x_component.c index cf60a7ee8f3..386e67a6751 100644 --- a/opal/mca/pmix/ext2x/ext2x_component.c +++ b/opal/mca/pmix/ext2x/ext2x_component.c @@ -144,9 +144,7 @@ static int external_component_query(mca_base_module_t **module, int *priority) char *t, *id; /* see if a PMIx server is present */ - if (NULL != (t = getenv("PMIX_SERVER_URI")) || - NULL != (t = getenv("PMIX_SERVER_URI2")) || - NULL != (id = getenv("PMIX_ID"))) { + if (NULL != (t = getenv("PMIX_NAMESPACE"))) { /* if PMIx is present, then we are a client and need to use it */ *priority = 100; } else {