From 0f1f5e6249df0ceba92fa160dc043af917a3cf0a Mon Sep 17 00:00:00 2001 From: Boris Karasev Date: Thu, 21 Jun 2018 09:01:16 +0300 Subject: [PATCH] v3.0.x: pmix/ext2x: fixed detection PMIx v2.0 by pmix component Corresponds to 39c9cb12bbb8d46e630d140178ac0e099e5fa190 Signed-off-by: Boris Karasev --- opal/mca/pmix/ext2x/pmix2x_component.c | 1 + opal/mca/pmix/pmix2x/pmix2x_component.c | 1 + 2 files changed, 2 insertions(+) diff --git a/opal/mca/pmix/ext2x/pmix2x_component.c b/opal/mca/pmix/ext2x/pmix2x_component.c index 3860ab677be..6657307c1d5 100644 --- a/opal/mca/pmix/ext2x/pmix2x_component.c +++ b/opal/mca/pmix/ext2x/pmix2x_component.c @@ -100,6 +100,7 @@ static int external_component_query(mca_base_module_t **module, int *priority) /* 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 PMIx is present, then we are a client and need to use it */ *priority = 100; diff --git a/opal/mca/pmix/pmix2x/pmix2x_component.c b/opal/mca/pmix/pmix2x/pmix2x_component.c index 03246c11801..c6141ec4ad8 100644 --- a/opal/mca/pmix/pmix2x/pmix2x_component.c +++ b/opal/mca/pmix/pmix2x/pmix2x_component.c @@ -117,6 +117,7 @@ static int external_component_query(mca_base_module_t **module, int *priority) /* 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 PMIx is present, then we are a client and need to use it */ *priority = 100;