Skip to content

v3.0: PML/UCX: fixed hang on MPI_Finalize #5315

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 2 commits into from
Jun 26, 2018
Merged

v3.0: PML/UCX: fixed hang on MPI_Finalize #5315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7d60dc
PML/UCX: fixed hang on MPI_Finalize
Jun 20, 2018
0399f77
pml/ucx: silence a warning
ggouaillardet Jun 22, 2018
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
24 changes: 13 additions & 11 deletions ompi/mca/pml/ucx/pml_ucx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
* Copyright (C) Mellanox Technologies Ltd. 2001-2011. ALL RIGHTS RESERVED.
* Copyright (C) 2001-2011 Mellanox Technologies Ltd. 2001-2011. ALL RIGHTS RESERVED.
* Copyright (c) 2016 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -381,14 +383,19 @@ static void mca_pml_ucx_waitall(void **reqs, size_t *count_p)
*count_p = 0;
}

static void mca_pml_fence_complete_cb(int status, void *fenced)
{
*(int*)fenced = 1;
}

int mca_pml_ucx_del_procs(struct ompi_proc_t **procs, size_t nprocs)
{
volatile int fenced = 0;
ompi_proc_t *proc;
size_t num_reqs, max_reqs;
void *dreq, **dreqs;
ucp_ep_h ep;
size_t i;
ucs_status_t ret;

max_reqs = ompi_pml_ucx.num_disconnect;
if (max_reqs > nprocs) {
Expand Down Expand Up @@ -430,16 +437,11 @@ int mca_pml_ucx_del_procs(struct ompi_proc_t **procs, size_t nprocs)

mca_pml_ucx_waitall(dreqs, &num_reqs);
free(dreqs);
/* flush worker to allow all pending operations to complete.
* ignore error (we can do nothing here), just try to
* finalize gracefully */
ret = ucp_worker_flush(ompi_pml_ucx.ucp_worker);
if (UCS_OK != ret) {
PML_UCX_ERROR("ucp_worker_flush failed: %s",
ucs_status_string(ret));
}

opal_pmix.fence(NULL, 0);
opal_pmix.fence_nb(NULL, 0, mca_pml_fence_complete_cb, &fenced);
while (!fenced) {
ucp_worker_progress(ompi_pml_ucx.ucp_worker);
}

return OMPI_SUCCESS;
}
Expand Down