From 8fc779b59b264ddd141f811bbb22d2e83ee3e517 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 28 Jan 2021 08:28:30 -0700 Subject: [PATCH] Add upstream patch for generalized requests --- 8348.patch | 25 +++++++++++++++++++++++++ openmpi.spec | 9 +++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 8348.patch diff --git a/8348.patch b/8348.patch new file mode 100644 index 0000000..89d5fd7 --- /dev/null +++ b/8348.patch @@ -0,0 +1,25 @@ +From 838568da9fce85b4555b0e0cbd899c8e8ef75696 Mon Sep 17 00:00:00 2001 +From: George Bosilca +Date: Wed, 6 Jan 2021 13:30:40 -0500 +Subject: [PATCH] A started generalized request should be marked as pending. + +Fixes #8340 + +Signed-off-by: George Bosilca +(cherry picked from commit 434a2515f8aab11f505b2fca0b3d8cc41e24cef2) +--- + ompi/request/grequest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ompi/request/grequest.c b/ompi/request/grequest.c +index c895b4232b6..02affd642aa 100644 +--- a/ompi/request/grequest.c ++++ b/ompi/request/grequest.c +@@ -163,6 +163,7 @@ int ompi_grequest_start( + greq->greq_free.c_free = gfree_fn; + greq->greq_cancel.c_cancel = gcancel_fn; + greq->greq_base.req_status = ompi_status_empty; ++ greq->greq_base.req_complete = REQUEST_PENDING; + + *request = &greq->greq_base; + return OMPI_SUCCESS; diff --git a/openmpi.spec b/openmpi.spec index 92e74fe..52b5fcc 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -31,7 +31,7 @@ Name: openmpi%{?_cc_name_suffix} Version: 4.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -44,7 +44,9 @@ Source3: openmpi.pth.py3 Source4: macros.openmpi # Fix AVX library linkage -Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/8322.patch +Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/8322.patch +# Fix generalized requests (mpi4py test failure) +Patch1: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/8348.patch BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -361,6 +363,9 @@ make check %changelog +* Thu Jan 28 2021 Orion Poplawski - 4.1.0-5 +- Add upstream patch for generalized requests + * Thu Jan 28 2021 Orion Poplawski - 4.1.0-4 - Add upstream patch to fix AVX library linkage