Skip to content

OSC UCX: Fix the flush issue in dynamic win accumulate #10540

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
Jul 1, 2022
Merged

OSC UCX: Fix the flush issue in dynamic win accumulate #10540

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
30 changes: 27 additions & 3 deletions ompi/mca/osc/ucx/osc_ucx_comm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,10 @@ int accumulate_req(const void *origin_addr, int origin_count,

ompi_osc_ucx_module_t *module = (ompi_osc_ucx_module_t*) win->w_osc_module;
int ret = OMPI_SUCCESS;
int win_idx = -1;
uint64_t remote_addr = (module->addrs[target]) + target_disp *
OSC_UCX_GET_DISP(module, target);
opal_common_ucx_wpmem_t *mem = module->mem;
void *free_ptr = NULL;
bool lock_acquired = false;

Expand All @@ -650,6 +654,14 @@ int accumulate_req(const void *origin_addr, int origin_count,
target_disp, NULL, ucx_req);
}

if (module->flavor == MPI_WIN_FLAVOR_DYNAMIC) {
ret = get_dynamic_win_info(remote_addr, module, target, &win_idx);
if (ret != OMPI_SUCCESS) {
return ret;
}
mem = module->local_dynamic_win_info[win_idx].mem;
}

ret = start_atomicity(module, target, &lock_acquired);
if (ret != OMPI_SUCCESS) {
return ret;
Expand Down Expand Up @@ -691,7 +703,7 @@ int accumulate_req(const void *origin_addr, int origin_count,
return ret;
}

ret = opal_common_ucx_wpmem_flush(module->mem, OPAL_COMMON_UCX_SCOPE_EP, target);
ret = opal_common_ucx_wpmem_flush(mem, OPAL_COMMON_UCX_SCOPE_EP, target);
if (ret != OMPI_SUCCESS) {
free(temp_addr);
return ret;
Expand Down Expand Up @@ -936,6 +948,10 @@ int get_accumulate_req(const void *origin_addr, int origin_count,
ompi_osc_ucx_request_t *ucx_req) {
ompi_osc_ucx_module_t *module = (ompi_osc_ucx_module_t*) win->w_osc_module;
int ret = OMPI_SUCCESS;
int win_idx = -1;
uint64_t remote_addr = (module->addrs[target]) + target_disp *
OSC_UCX_GET_DISP(module, target);
opal_common_ucx_wpmem_t *mem = module->mem;
void *free_addr = NULL;
bool lock_acquired = false;

Expand All @@ -951,6 +967,14 @@ int get_accumulate_req(const void *origin_addr, int origin_count,
target_disp, result_addr, ucx_req);
}

if (module->flavor == MPI_WIN_FLAVOR_DYNAMIC) {
ret = get_dynamic_win_info(remote_addr, module, target, &win_idx);
if (ret != OMPI_SUCCESS) {
return ret;
}
mem = module->local_dynamic_win_info[win_idx].mem;
}

ret = start_atomicity(module, target, &lock_acquired);
if (ret != OMPI_SUCCESS) {
return ret;
Expand All @@ -962,7 +986,7 @@ int get_accumulate_req(const void *origin_addr, int origin_count,
return ret;
}

ret = opal_common_ucx_wpmem_flush(module->mem, OPAL_COMMON_UCX_SCOPE_EP, target);
ret = opal_common_ucx_wpmem_flush(mem, OPAL_COMMON_UCX_SCOPE_EP, target);
if (ret != OMPI_SUCCESS) {
return ret;
}
Expand Down Expand Up @@ -1004,7 +1028,7 @@ int get_accumulate_req(const void *origin_addr, int origin_count,
return ret;
}

ret = opal_common_ucx_wpmem_flush(module->mem, OPAL_COMMON_UCX_SCOPE_EP, target);
ret = opal_common_ucx_wpmem_flush(mem, OPAL_COMMON_UCX_SCOPE_EP, target);
if (ret != OMPI_SUCCESS) {
return ret;
}
Expand Down