rpms
/
openmpi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add upstream patch OSC/UCX: use correct rkey for atomic_fadd in rget/rput

This commit is contained in:
Orion Poplawski 2019-05-15 22:21:03 -06:00
parent d91ddbc657
commit 7ef7dc2bf9
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
6594.patch Normal file
View File

@ -0,0 +1,32 @@
From 68c88e86f2c8ff515a4c54927077143de13516b9 Mon Sep 17 00:00:00 2001
From: Valentin Petrov <valentinp@mellanox.com>
Date: Tue, 16 Apr 2019 14:04:11 +0300
Subject: [PATCH] OSC/UCX: use correct rkey for atomic_fadd in rget/rput
Signed-off-by: Valentin Petrov <valentinp@mellanox.com>
---
ompi/mca/osc/ucx/osc_ucx_comm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ompi/mca/osc/ucx/osc_ucx_comm.c b/ompi/mca/osc/ucx/osc_ucx_comm.c
index ec760d4fda3..bc3b7f5e7ed 100644
--- a/ompi/mca/osc/ucx/osc_ucx_comm.c
+++ b/ompi/mca/osc/ucx/osc_ucx_comm.c
@@ -881,7 +881,7 @@ int ompi_osc_ucx_rput(const void *origin_addr, int origin_count,
CHECK_VALID_RKEY(module, target, target_count);
- rkey = (module->win_info_array[target]).rkey;
+ rkey = (module->state_info_array[target]).rkey;
OMPI_OSC_UCX_REQUEST_ALLOC(win, ucx_req);
assert(NULL != ucx_req);
@@ -942,7 +942,7 @@ int ompi_osc_ucx_rget(void *origin_addr, int origin_count,
CHECK_VALID_RKEY(module, target, target_count);
- rkey = (module->win_info_array[target]).rkey;
+ rkey = (module->state_info_array[target]).rkey;
OMPI_OSC_UCX_REQUEST_ALLOC(win, ucx_req);
assert(NULL != ucx_req);

7
openmpi.spec
View File

@ -21,7 +21,7 @@
Name: openmpi%{?_cc_name_suffix}
Version: 4.0.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Open Message Passing Interface
License: BSD and MIT and Romio
URL: http://www.open-mpi.org/
@ -34,6 +34,8 @@ Source3: openmpi.pth.py3
Source4: macros.openmpi
# Fix for UCX usage with BTL/UCT
Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/6668.patch
# OSC/UCX: use correct rkey for atomic_fadd in rget/rput
Patch1: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/6594.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
@ -339,6 +341,9 @@ make check
%changelog
* Wed May 15 2019 Orion Poplawski <orion@nwra.com> - 4.0.1-4
- Add upstream patch OSC/UCX: use correct rkey for atomic_fadd in rget/rput
* Wed May 15 2019 Orion Poplawski <orion@nwra.com> - 4.0.1-3
- Add upstream patch to fix issue with UCX usage in BTL/UCT