commit openmpi3 for openSUSE:Factory

[Source-Sync]

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-03-07 19:36:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openmpi3 (Old)
 and      /work/SRC/openSUSE:Factory/.openmpi3.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openmpi3"

Mon Mar  7 19:36:20 2022 rev:27 rq:960030 version:3.1.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/openmpi3/openmpi3.changes        2021-10-20 
20:24:50.797398903 +0200
+++ /work/SRC/openSUSE:Factory/.openmpi3.new.1958/openmpi3.changes      
2022-03-07 19:36:21.313405058 +0100
@@ -1,0 +2,6 @@
+Mon Mar  7 16:54:42 UTC 2022 - Nicolas Morey-Chaisemartin 
<nmoreychaisemar...@suse.com>
+
+- Add fix-rdma-component-selection.patch to fix bad rdma component selection
+  which can cause stall when running on multiple IB nodes (bsc#1196838).
+
+-------------------------------------------------------------------

New:
----
  fix-rdma-component-selection.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openmpi3.spec ++++++
--- /var/tmp/diff_new_pack.exSWkv/_old  2022-03-07 19:36:21.957404878 +0100
+++ /var/tmp/diff_new_pack.exSWkv/_new  2022-03-07 19:36:21.961404877 +0100
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
@@ -171,6 +171,7 @@
 Patch0:         Build-warning-stringop-overflow-in.patch
 Patch1:         reproducible.patch
 Patch2:         memory-patcher-fix-compiler-warning.patch
+Patch3:         fix-rdma-component-selection.patch
 Provides:       mpi
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
@@ -436,6 +437,7 @@
 %endif
 %patch1 -p1
 %patch2
+%patch3
 # 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

++++++ fix-rdma-component-selection.patch ++++++
commit 923ca7c6424d0cf0b5139be316b651d54d90d5f5
Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
Date:   Wed Mar 28 11:17:17 2018 +0200

    fix rdma component selection
    
    Github issue#4976
    bsc#1087031
    
    Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>

diff --git ompi/mca/osc/rdma/osc_rdma_component.c 
ompi/mca/osc/rdma/osc_rdma_component.c
index 45da5aafab4d..9cb8535683c1 100644
--- ompi/mca/osc/rdma/osc_rdma_component.c
+++ ompi/mca/osc/rdma/osc_rdma_component.c
@@ -355,6 +355,8 @@ static int ompi_osc_rdma_component_query (struct ompi_win_t 
*win, void **base, s
                                           int flavor)
 {
 
+    int rc;
+
     if (MPI_WIN_FLAVOR_SHARED == flavor) {
         return -1;
     }
@@ -368,15 +370,18 @@ static int ompi_osc_rdma_component_query (struct 
ompi_win_t *win, void **base, s
     }
 #endif /* OPAL_CUDA_SUPPORT */
 
-    if (OMPI_SUCCESS == ompi_osc_rdma_query_mtls ()) {
+    rc = ompi_osc_rdma_query_mtls ();
+    rc = comm->c_coll->coll_allreduce(MPI_IN_PLACE, &rc, 1, MPI_INT, MPI_MIN, 
comm, comm->c_coll->coll_allreduce_module);
+    if (OMPI_SUCCESS == rc) {
         return 5; /* this has to be lower that osc pt2pt default priority */
     }
-
-    if (OMPI_SUCCESS != ompi_osc_rdma_query_btls (comm, NULL)) {
+ 
+    rc = ompi_osc_rdma_query_btls (comm, NULL);
+    rc = comm->c_coll->coll_allreduce(MPI_IN_PLACE, &rc, 1, MPI_INT, MPI_MIN, 
comm, comm->c_coll->coll_allreduce_module);
+    if (OMPI_SUCCESS != rc) {
         return -1;
     }
 
-
     return mca_osc_rdma_component.priority;
 }