From 7ef7dc2bf928f63d5e3f2a65e2cfbb80560da8cf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 15 May 2019 22:21:03 -0600 Subject: [PATCH] Add upstream patch OSC/UCX: use correct rkey for atomic_fadd in rget/rput --- 6594.patch | 32 ++++++++++++++++++++++++++++++++ openmpi.spec | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 6594.patch diff --git a/6594.patch b/6594.patch new file mode 100644 index 0000000..3c9e5ba --- /dev/null +++ b/6594.patch @@ -0,0 +1,32 @@ +From 68c88e86f2c8ff515a4c54927077143de13516b9 Mon Sep 17 00:00:00 2001 +From: Valentin Petrov +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 +--- + 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); diff --git a/openmpi.spec b/openmpi.spec index 6ba71f1..3335d86 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -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 - 4.0.1-4 +- Add upstream patch OSC/UCX: use correct rkey for atomic_fadd in rget/rput + * Wed May 15 2019 Orion Poplawski - 4.0.1-3 - Add upstream patch to fix issue with UCX usage in BTL/UCT