From 2947ab2dbc01e474db7d3f4e3d8ae143ba7475cf Mon Sep 17 00:00:00 2001 From: Valentin Petrov Date: Wed, 17 Apr 2019 09:59:19 +0300 Subject: [PATCH] OSC/UCX: correctly handle NULL origin addr and MPI_NO_OP Signed-off-by: Valentin Petrov --- ompi/mca/osc/ucx/osc_ucx_comm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mca/osc/ucx/osc_ucx_comm.c b/ompi/mca/osc/ucx/osc_ucx_comm.c index ec760d4fda..a2ccf207df 100644 --- a/ompi/mca/osc/ucx/osc_ucx_comm.c +++ b/ompi/mca/osc/ucx/osc_ucx_comm.c @@ -673,7 +673,7 @@ int ompi_osc_ucx_fetch_and_op(const void *origin_addr, void *result_addr, ucp_ep_h ep = OSC_UCX_GET_EP(module->comm, target); uint64_t remote_addr = (module->win_info_array[target]).addr + target_disp * OSC_UCX_GET_DISP(module, target); ucp_rkey_h rkey; - uint64_t value = *(uint64_t *)origin_addr; + uint64_t value = origin_addr ? *(uint64_t *)origin_addr : 0; ucp_atomic_fetch_op_t opcode; size_t dt_bytes; ompi_osc_ucx_internal_request_t *req = NULL;