Skip to content

osc/rdma: fix amo-based accumulate #8469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2021
Merged

osc/rdma: fix amo-based accumulate #8469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ompi/mca/osc/rdma/osc_rdma_accumulate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,16 +260,14 @@ static inline int ompi_osc_rdma_gacc_amo (ompi_osc_rdma_module_t *module, ompi_o
{
const bool use_amo = module->acc_use_amo;
const size_t dt_size = datatype->super.size;
void *to_free = NULL;
uint64_t offset = 0;
int ret;

OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "using network atomics for accumulate operation with count %d", count);

/* only one can be non-NULL */
assert (NULL == result || NULL == result_convertor);

if (NULL == result && NULL != result_convertor) {
result = malloc (request->len);
if (NULL == result) {
to_free = result = malloc (request->len);
if (OPAL_UNLIKELY(NULL == result)) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
Expand Down Expand Up @@ -316,6 +314,8 @@ static inline int ompi_osc_rdma_gacc_amo (ompi_osc_rdma_module_t *module, ompi_o
ompi_osc_rdma_request_complete (request, MPI_SUCCESS);
}

free (to_free);

return OMPI_SUCCESS;
}

Expand All @@ -331,6 +331,8 @@ static inline int ompi_osc_rdma_gacc_contig (ompi_osc_rdma_sync_t *sync, const v
char *ptr = NULL;
int ret;

request->len = target_datatype->super.size * module->network_amo_max_count;

OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "initiating accumulate on contiguous region of %lu bytes to remote address %" PRIx64
", sync %p", len, target_address, (void *) sync);

Expand Down Expand Up @@ -582,7 +584,7 @@ static inline int ompi_osc_rdma_gacc_master (ompi_osc_rdma_sync_t *sync, const v
}

ret = ompi_osc_rdma_gacc_contig (sync, source_iovec[source_iov_index].iov_base, acc_len / target_primitive->super.size,
target_primitive, NULL, 0, NULL, &result_convertor, peer,
target_primitive, NULL, 0, NULL, result_datatype ? &result_convertor : NULL, peer,
(uint64_t) (intptr_t) target_iovec[target_iov_index].iov_base, target_handle,
acc_len / target_primitive->super.size, target_primitive, op, subreq);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
Expand Down