Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openmpi3 for openSUSE:Factory
checked in at 2022-09-30 17:58:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openmpi3 (Old)
and /work/SRC/openSUSE:Factory/.openmpi3.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi3"
Fri Sep 30 17:58:38 2022 rev:29 rq:1007181 version:3.1.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/openmpi3/openmpi3.changes 2022-06-13
13:03:41.057211721 +0200
+++ /work/SRC/openSUSE:Factory/.openmpi3.new.2275/openmpi3.changes
2022-09-30 17:59:01.397406222 +0200
@@ -1,0 +2,17 @@
+Wed Jul 6 12:29:12 UTC 2022 - Nicolas Morey-Chaisemartin
<nmoreychaisemar...@suse.com>
+
+- Enable libfabric on all arch
+- Switch to external libevent for all flavors
+- Switch to external hwloc and PMIx for HPC builds
+- Add patches to fix compilation against hwloc v2.x
+ -
Revert-hwloc-bring-back-the-configure-error-when-external-hwloc-is-2.0.patch
+ - hwloc-fix-hwloc-shmem.h-in-the-external-case.patch
+ - hwloc-updates-for-hwloc-2.0.x-API.patch
+- Backport upstream patches for external PMIx support
+ - pmix-pmix2x-Fix-the-PMIx-discovery-logic.patch
+ - pmix-Fix-detection-of-Externally-built-PMIx.patch
+- Update rpmlintrc file to ignore missing libname suffix in libopenmpi packages
+- Add patch btl-openib-Add-support-for-newer-hardware.patch to support
+ newer RDMA hardware (ConnectX 4 and 5 VF, ConnectX6 PF + VF and Broadcom
adapters)
+
+-------------------------------------------------------------------
New:
----
Revert-hwloc-bring-back-the-configure-error-when-external-hwloc-is-2.0.patch
btl-openib-Add-support-for-newer-hardware.patch
hwloc-fix-hwloc-shmem.h-in-the-external-case.patch
hwloc-updates-for-hwloc-2.0.x-API.patch
pmix-Fix-detection-of-Externally-built-PMIx.patch
pmix-pmix2x-Fix-the-PMIx-discovery-logic.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openmpi3.spec ++++++
--- /var/tmp/diff_new_pack.JS8vQa/_old 2022-09-30 17:59:02.089407702 +0200
+++ /var/tmp/diff_new_pack.JS8vQa/_new 2022-09-30 17:59:02.093407711 +0200
@@ -146,6 +146,11 @@
%global hpc_openmpi_dep_version %(VER=%m_f_ver; echo -n ${VER})
%global hpc_openmpi_dir openmpi%{hpc_openmpi_dep_version}
%global hpc_openmpi_pack_version %{hpc_openmpi_dep_version}
+%{bcond_without pmix}
+%{bcond_without hwloc}
+%else
+%{bcond_with pmix}
+%{bcond_with hwloc}
%endif
%define git_ver .0.ea348728b4c8
@@ -174,12 +179,20 @@
Patch3: fix-rdma-component-selection.patch
Patch4:
Fix-error-with-stricter-quoting-requirements-of-autoconf-2.70.patch
Patch5: Always-include-the-stddef.h-header.patch
+Patch6:
Revert-hwloc-bring-back-the-configure-error-when-external-hwloc-is-2.0.patch
+Patch7: hwloc-fix-hwloc-shmem.h-in-the-external-case.patch
+Patch8: hwloc-updates-for-hwloc-2.0.x-API.patch
+Patch9: pmix-pmix2x-Fix-the-PMIx-discovery-logic.patch
+Patch10: pmix-Fix-detection-of-Externally-built-PMIx.patch
+Patch11: btl-openib-Add-support-for-newer-hardware.patch
Provides: mpi
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: flex
+BuildRequires: libevent-devel
+BuildRequires: libfabric-devel
BuildRequires: libibumad-devel
BuildRequires: libibverbs-devel
BuildRequires: libtool
@@ -195,6 +208,12 @@
BuildRequires: libucs-devel
BuildRequires: libuct-devel
%endif
+%if %{with hwloc}
+BuildRequires: hwloc-devel
+%endif
+%if %{with pmix}
+BuildRequires: pmix-devel
+%endif
%if %{without hpc}
BuildRequires: Modules
BuildRequires: gcc-c++
@@ -215,7 +234,6 @@
%ifarch %{ix86} x86_64
BuildRequires: infinipath-psm-devel
-BuildRequires: libfabric-devel
%endif
%ifarch x86_64
@@ -393,9 +411,11 @@
Group: Development/Libraries/Parallel
Provides: openmpi-runtime-config = %{version}
Conflicts: otherproviders(openmpi-runtime-config)
+%if %{without pmix}
# OpenMPI3 is PMIx enabled
Provides: pmix-runtime-config = %{version}
Conflicts: otherproviders(pmix-runtime-config)
+%endif
%description -n %{pname}%{m_f_ver}-config
OpenMPI is an implementation of the Message Passing Interface, a
@@ -442,6 +462,13 @@
%patch3
%patch4
%patch5
+%patch6
+%patch7
+%patch8
+%patch9
+%patch10
+%patch11
+
# Live patch the VERSION file
sed -i -e 's/^greek=.*$/greek=%{git_ver}/' -e
's/^repo_rev=.*$/repo_rev=%{version}%{git_ver}/' \
-e 's/^date=.*$/date="OpenMPI %{version} Distribution for SUSE"/'
VERSION
@@ -476,9 +503,17 @@
--enable-builtin-atomics \
--with-libltdl=%{_prefix} \
--with-verbs \
+ --with-libfabric \
--enable-mpi-thread-multiple \
--disable-wrapper-rpath \
--with-slurm \
+ --with-libevent=external \
+%if %{with hwloc}
+ --with-hwloc=external \
+%endif
+%if %{with pmix}
+ --with-pmix=external \
+%endif
%if 0%{?with_ucx}
--with-ucx \
--with-ucx-libdir=/usr/%_lib \
@@ -628,8 +663,10 @@
rm -f %{buildroot}%{_sysconfdir}/openmpi-default-hostfile
rm -f %{buildroot}%{_sysconfdir}/openmpi-mca-params.conf
rm -f %{buildroot}%{_sysconfdir}/openmpi-totalview.tcl
+%if %{without pmix}
rm -f %{buildroot}%{_sysconfdir}/pmix-mca-params.conf
%endif
+%endif
%if %{without hpc}
%post
@@ -714,8 +751,11 @@
%{mpi_datadir}/openmpi/mca-btl-openib-device-params.ini
%{mpi_datadir}/openmpi/*-data.txt
%{mpi_datadir}/openmpi/help-*.txt
+%if %{without pmix}
%dir %{mpi_datadir}/pmix
%{mpi_datadir}/pmix/help-*.txt
+%{mpi_datadir}/pmix/help-*.txt
+%endif
%files %{!?with_hpc:libs}%{?with_hpc:-n lib%{name}}
%defattr(-,root,root)
@@ -723,7 +763,7 @@
%dir %mpi_libdir/
%mpi_libdir/*.so.*
%{mpi_libdir}/openmpi/*.so
-%if 0%{!?build_static_devel:1}
+%if %{without pmix}
%dir %mpi_libdir/pmix/
%{mpi_libdir}/pmix/*.so
%endif
@@ -761,7 +801,9 @@
%{mpi_bindir}/shmemcxx
%{mpi_bindir}/shmemfort
%{mpi_datadir}/openmpi/openmpi-valgrind.supp
+%if %{without pmix}
%{mpi_datadir}/pmix/pmix-valgrind.supp
+%endif
%files docs
%defattr(-, root, root, -)
@@ -788,7 +830,9 @@
%files -n %{pname}%{m_f_ver}-config
%config %{_sysconfdir}/openmpi-default-hostfile
%config %{_sysconfdir}/openmpi-mca-params.conf
+%if %{without pmix}
%config %{_sysconfdir}/pmix-mca-params.conf
+%endif
%{_sysconfdir}/openmpi-totalview.tcl
%endif
++++++
Revert-hwloc-bring-back-the-configure-error-when-external-hwloc-is-2.0.patch
++++++
commit b80cf0f5de7720f71189f594125f986193c12f81
Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
Date: Tue Jul 12 09:36:25 2022 +0200
Revert "hwloc: bring back the configure error when external hwloc is >= 2.0"
This reverts commit 9eb37be46c75662eb4f6c945144121e3e55360be.
diff --git opal/mca/hwloc/external/configure.m4
opal/mca/hwloc/external/configure.m4
index d951c9a92f1b..411d8ad1c1f2 100644
--- opal/mca/hwloc/external/configure.m4
+++ opal/mca/hwloc/external/configure.m4
@@ -184,21 +184,7 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Cannot continue])])
- AC_MSG_CHECKING([if external hwloc version is lower than 2.0])
- AS_IF([test "$opal_hwloc_dir" != ""],
- [opal_hwloc_external_CFLAGS_save=$CFLAGS
- CFLAGS="-I$opal_hwloc_dir/include
$opal_hwloc_external_CFLAGS_save"])
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#include <hwloc.h>]],
- [[
-#if HWLOC_API_VERSION >= 0x00020000
-#error "hwloc API version is greater or equal than 0x00020000"
-#endif
- ]])],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([OMPI does not currently support hwloc v2 API
-Cannot continue])])
+
AS_IF([test "$opal_hwloc_dir" != ""],
[CFLAGS=$opal_hwloc_external_CFLAGS_save])
++++++ btl-openib-Add-support-for-newer-hardware.patch ++++++
commit 64434b46183221882cb767dc29b25cc90576b9ef
Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
Date: Tue Sep 13 15:48:59 2022 +0200
btl: openib: Add support for newer hardware
- ConnectX4 VF
- ConnectX5 VF
- ConnectX6 VF
- New broadcom PCI Ids
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
fix
diff --git opal/mca/btl/openib/mca-btl-openib-device-params.ini
opal/mca/btl/openib/mca-btl-openib-device-params.ini
index b51a7dcdde78..b9949de235b8 100644
--- opal/mca/btl/openib/mca-btl-openib-device-params.ini
+++ opal/mca/btl/openib/mca-btl-openib-device-params.ini
@@ -174,7 +174,7 @@ max_inline_data = 256
[Mellanox ConnectX4]
vendor_id = 0x2c9,0x5ad,0x66a,0x8f1,0x1708,0x03ba,0x15b3,0x119f
-vendor_part_id = 4115,4117
+vendor_part_id = 4115,4116,4117,4118
use_eager_rdma = 1
mtu = 4096
max_inline_data = 256
@@ -183,7 +183,7 @@ max_inline_data = 256
[Mellanox ConnectX5]
vendor_id = 0x2c9,0x5ad,0x66a,0x8f1,0x1708,0x03ba,0x15b3,0x119f
-vendor_part_id = 4119,4121
+vendor_part_id = 4119,4120,4121,4122
use_eager_rdma = 1
mtu = 4096
max_inline_data = 256
@@ -192,7 +192,7 @@ max_inline_data = 256
[Mellanox ConnectX6]
vendor_id = 0x2c9,0x5ad,0x66a,0x8f1,0x1708,0x03ba,0x15b3,0x119f
-vendor_part_id = 4123
+vendor_part_id = 4123,4124
use_eager_rdma = 1
mtu = 4096
max_inline_data = 256
@@ -345,7 +345,7 @@ max_inline_data = 72
[Broadcom BCM57XXX]
vendor_id = 0x14e4
-vendor_part_id =
0x1605,0x1606,0x1614,0x16c0,0x16c1,0x16ce,0x16cf,0x16d6,0x16d7,0x16d8,0x16d9,0x16df,0x16e2,0x16e3,0x16e5,0x16eb,0x16ed,0x16ef,0x16f0,0x16f1,0x1750
+vendor_part_id =
0x1605,0x1606,0x1614,0x16c0,0x16c1,0x16ce,0x16cf,0x16d6,0x16d7,0x16d8,0x16d9,0x16df,0x16e2,0x16e3,0x16e5,0x16eb,0x16ed,0x16ef,0x16f0,0x16f1
use_eager_rdma = 1
mtu = 1024
receive_queues = P,65536,256,192,128
++++++ hwloc-fix-hwloc-shmem.h-in-the-external-case.patch ++++++
commit 6a2d129fd28ca90c5c3f857eeb5ff933abc33470
Author: Brice Goglin <brice.gog...@inria.fr>
Date: Fri Jan 26 15:44:15 2018 +0100
hwloc: fix hwloc/shmem.h in the external case
Signed-off-by: Brice Goglin <brice.gog...@inria.fr>
diff --git opal/mca/hwloc/base/hwloc_base_util.c
opal/mca/hwloc/base/hwloc_base_util.c
index f8ca72c182d1..dd483a7dc1be 100644
--- opal/mca/hwloc/base/hwloc_base_util.c
+++ opal/mca/hwloc/base/hwloc_base_util.c
@@ -27,6 +27,7 @@
* $HEADER$
*/
+#define OPAL_HWLOC_WANT_SHMEM 1
#include "opal_config.h"
diff --git opal/mca/hwloc/external/configure.m4
opal/mca/hwloc/external/configure.m4
index 411d8ad1c1f2..b8214099ef84 100644
--- opal/mca/hwloc/external/configure.m4
+++ opal/mca/hwloc/external/configure.m4
@@ -63,12 +63,17 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
# the MCA_hwloc_external_openfabrics_helper define).
AS_IF([test "$opal_hwloc_dir" != ""],
[opal_hwloc_include="$opal_hwloc_dir/include/hwloc.h"
+
opal_hwloc_shmem_include="$opal_hwloc_dir/include/hwloc/shmem.h",
opal_hwloc_openfabrics_include="$opal_hwloc_dir/include/hwloc/openfabrics-verbs.h"],
[opal_hwloc_include="hwloc.h"
+ opal_hwloc_shmem_include="hwloc/shmem.h"
opal_hwloc_openfabrics_include="hwloc/openfabrics-verbs.h"])
AC_DEFINE_UNQUOTED(MCA_hwloc_external_header,
["$opal_hwloc_include"],
[Location of external hwloc header])
+ AC_DEFINE_UNQUOTED(MCA_hwloc_external_shmem_header,
+ ["$opal_hwloc_shmem_include"],
+ [Location of external hwloc shmem header])
AC_DEFINE_UNQUOTED(MCA_hwloc_external_openfabrics_header,
["$opal_hwloc_openfabrics_include"],
[Location of external hwloc OpenFabrics header])
diff --git opal/mca/hwloc/external/external.h opal/mca/hwloc/external/external.h
index 6558a0bcbd14..0e1a91fcf470 100644
--- opal/mca/hwloc/external/external.h
+++ opal/mca/hwloc/external/external.h
@@ -43,6 +43,14 @@ BEGIN_C_DECLS
# endif
#endif
+#if defined(OPAL_HWLOC_WANT_SHMEM) && OPAL_HWLOC_WANT_SHMEM
+# if HWLOC_API_VERSION >= 0x20000
+# include MCA_hwloc_external_shmem_header
+# else
+# error Tried to include hwloc shmem header, but hwloc < 2.0 found
+# endif
+#endif
+
#if HWLOC_API_VERSION < 0x00010b00
#define HWLOC_OBJ_NUMANODE HWLOC_OBJ_NODE
#define HWLOC_OBJ_PACKAGE HWLOC_OBJ_SOCKET
diff --git orte/mca/rtc/hwloc/rtc_hwloc.c orte/mca/rtc/hwloc/rtc_hwloc.c
index b832d4cf6bc9..8acdf572b577 100644
--- orte/mca/rtc/hwloc/rtc_hwloc.c
+++ orte/mca/rtc/hwloc/rtc_hwloc.c
@@ -9,6 +9,8 @@
* $HEADER$
*/
+#define OPAL_HWLOC_WANT_SHMEM 1
+
#include "orte_config.h"
#include "orte/constants.h"
#include "orte/types.h"
++++++ hwloc-updates-for-hwloc-2.0.x-API.patch ++++++
commit 287d7866d3bd70c1a8d412ffb8e6b12cd7e903d5
Author: Jeff Squyres <jsquy...@cisco.com>
Date: Thu Jan 4 09:58:50 2018 -0800
hwloc: updates for hwloc 2.0.x API
Signed-off-by: Jeff Squyres <jsquy...@cisco.com>
diff --git opal/mca/btl/openib/btl_openib_component.c
opal/mca/btl/openib/btl_openib_component.c
index c482dcdbcda7..facf338a5373 100644
--- opal/mca/btl/openib/btl_openib_component.c
+++ opal/mca/btl/openib/btl_openib_component.c
@@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
- * Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved
+ * Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2006-2015 Mellanox Technologies. All rights reserved.
* Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights
* reserved.
@@ -1524,7 +1524,11 @@ static uint64_t calculate_total_mem (void)
if (NULL == machine) {
return 0;
}
+#if HWLOC_API_VERSION < 0x20000
return machine->memory.total_memory;
+#else
+ return machine->total_memory;
+#endif
}
/* couldn't find it */
diff --git opal/mca/hwloc/base/hwloc_base_util.c
opal/mca/hwloc/base/hwloc_base_util.c
index dd483a7dc1be..61d8b779888c 100644
--- opal/mca/hwloc/base/hwloc_base_util.c
+++ opal/mca/hwloc/base/hwloc_base_util.c
@@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
- * Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved
+ * Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2012-2017 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
@@ -59,6 +59,11 @@
#include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/hwloc/base/base.h"
+#if HWLOC_API_VERSION >= 0x20000
+// JMS Is this right?
+#include "hwloc/shmem.h"
+#endif
+
static bool topo_in_shmem = false;
/*
@@ -154,7 +159,7 @@ int opal_hwloc_base_filter_cpus(hwloc_topology_t topo)
avail = hwloc_bitmap_alloc();
hwloc_bitmap_and(avail, root->online_cpuset, root->allowed_cpuset);
#else
- avail = hwloc_bitmap_dup(root->allowed_cpuset);
+ avail = hwloc_bitmap_dup(root->cpuset);
#endif
OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
"hwloc:base: no cpus specified - using root
available cpuset"));
@@ -178,7 +183,7 @@ int opal_hwloc_base_filter_cpus(hwloc_topology_t topo)
hwloc_bitmap_and(pucpus, pu->online_cpuset,
pu->allowed_cpuset);
#else
hwloc_bitmap_free(pucpus);
- pucpus = hwloc_bitmap_dup(pu->allowed_cpuset);
+ pucpus = hwloc_bitmap_dup(pu->cpuset);
#endif
hwloc_bitmap_or(res, avail, pucpus);
hwloc_bitmap_copy(avail, res);
@@ -200,7 +205,7 @@ int opal_hwloc_base_filter_cpus(hwloc_topology_t topo)
hwloc_bitmap_and(pucpus, pu->online_cpuset,
pu->allowed_cpuset);
#else
hwloc_bitmap_free(pucpus);
- pucpus = hwloc_bitmap_dup(pu->allowed_cpuset);
+ pucpus = hwloc_bitmap_dup(pu->cpuset);
#endif
hwloc_bitmap_or(res, avail, pucpus);
hwloc_bitmap_copy(avail, res);
diff --git orte/mca/rtc/hwloc/rtc_hwloc.c orte/mca/rtc/hwloc/rtc_hwloc.c
index 8acdf572b577..16d5b825e0c7 100644
--- orte/mca/rtc/hwloc/rtc_hwloc.c
+++ orte/mca/rtc/hwloc/rtc_hwloc.c
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
- * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
+ * Copyright (c) 2017-2018 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2017 Inria. All rights reserved.
* $COPYRIGHT$
*
@@ -50,6 +50,11 @@
#include "orte/mca/rtc/base/base.h"
#include "rtc_hwloc.h"
+#if HWLOC_API_VERSION >= 0x20000
+// JMS Is this right?
+#include "hwloc/shmem.h"
+#endif
+
static int init(void);
static void finalize(void);
static void assign(orte_job_t *jdata);
diff --git orte/orted/pmix/pmix_server_register_fns.c
orte/orted/pmix/pmix_server_register_fns.c
index 25fb26475918..ff98f6de59cb 100644
--- orte/orted/pmix/pmix_server_register_fns.c
+++ orte/orted/pmix/pmix_server_register_fns.c
@@ -11,7 +11,7 @@
* All rights reserved.
* Copyright (c) 2006-2013 Los Alamos National Security, LLC.
* All rights reserved.
- * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2009-2018 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc.
@@ -276,7 +276,11 @@ int orte_pmix_server_register_nspace(orte_job_t *jdata,
bool force)
kv = OBJ_NEW(opal_value_t);
kv->key = strdup(OPAL_PMIX_AVAIL_PHYS_MEMORY);
kv->type = OPAL_UINT64;
+#if HWLOC_API_VERSION < 0x20000
kv->data.uint64 = machine->memory.total_memory;
+#else
+ kv->data.uint64 = machine->total_memory;
+#endif
opal_list_append(info, &kv->super);
}
++++++ openmpi3-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.JS8vQa/_old 2022-09-30 17:59:02.225407992 +0200
+++ /var/tmp/diff_new_pack.JS8vQa/_new 2022-09-30 17:59:02.229408001 +0200
@@ -3,4 +3,5 @@
addFilter("openmpi3-libs.* rpath-in-buildconfig")
addFilter("openmpi3-devel.* shared-lib-calls-exit")
+addFilter("libopenmpi.* shlib-policy-name-error")
++++++ pmix-Fix-detection-of-Externally-built-PMIx.patch ++++++
commit ed3ecbc8be313cb3613d6022548deb41750b7725
Author: Artem Polyakov <artpo...@gmail.com>
Date: Tue Apr 20 15:16:24 2021 -0700
pmix: Fix detection of Externally-built PMIx
See https://github.com/open-mpi/ompi/issues/8823 for more details.
Signed-off-by: Artem Polyakov <artpo...@gmail.com>
diff --git opal/mca/pmix/ext1x/pmix1x_component.c
opal/mca/pmix/ext1x/pmix1x_component.c
index 747f95cc6139..57e91305fd85 100644
--- opal/mca/pmix/ext1x/pmix1x_component.c
+++ opal/mca/pmix/ext1x/pmix1x_component.c
@@ -95,8 +95,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 {
++++++ pmix-pmix2x-Fix-the-PMIx-discovery-logic.patch ++++++
commit 4bb0f4200ae67d203d59f19c7d38c01cc320ee03
Author: Artem Polyakov <artpo...@gmail.com>
Date: Tue Apr 20 09:17:32 2021 -0700
pmix/pmix2x: Fix the PMIx discovery logic
See https://github.com/open-mpi/ompi/issues/8823 for the details.
Signed-off-by: Artem Polyakov <artpo...@gmail.com>
diff --git opal/mca/pmix/pmix2x/pmix2x_component.c
opal/mca/pmix/pmix2x/pmix2x_component.c
index 74a08a77058b..0771331a0679 100644
--- opal/mca/pmix/pmix2x/pmix2x_component.c
+++ opal/mca/pmix/pmix2x/pmix2x_component.c
@@ -118,9 +118,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 {
