Add upstream patch for generalized requests

This commit is contained in:
Orion Poplawski 2021-01-28 08:28:30 -07:00
parent 8463f8f82f
commit 8fc779b59b
2 changed files with 32 additions and 2 deletions

25
8348.patch Normal file
View File

@ -0,0 +1,25 @@
From 838568da9fce85b4555b0e0cbd899c8e8ef75696 Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
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 <bosilca@icl.utk.edu>
(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;

View File

@ -31,7 +31,7 @@
Name: openmpi%{?_cc_name_suffix} Name: openmpi%{?_cc_name_suffix}
Version: 4.1.0 Version: 4.1.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
License: BSD and MIT and Romio License: BSD and MIT and Romio
URL: http://www.open-mpi.org/ URL: http://www.open-mpi.org/
@ -44,7 +44,9 @@ Source3: openmpi.pth.py3
Source4: macros.openmpi Source4: macros.openmpi
# Fix AVX library linkage # 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-c++
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
@ -361,6 +363,9 @@ make check
%changelog %changelog
* Thu Jan 28 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-5
- Add upstream patch for generalized requests
* Thu Jan 28 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-4 * Thu Jan 28 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-4
- Add upstream patch to fix AVX library linkage - Add upstream patch to fix AVX library linkage