Skip to content

pml_ucx: fix debug macros, and initialize mpi request properly. #1076

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
Oct 28, 2015
Merged

pml_ucx: fix debug macros, and initialize mpi request properly. #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41b6230
pml_ucx: fix debug macros, and initialize mpi request properly.
yosefe Oct 27, 2015
ae738d0
pml_ucx: add pmi fence in del_procs
yosefe Oct 28, 2015
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
1 change: 1 addition & 0 deletions ompi/mca/pml/ucx/pml_ucx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ int mca_pml_ucx_del_procs(struct ompi_proc_t **procs, size_t nprocs)
}
procs[i]->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_PML] = NULL;
}
opal_pmix.fence(NULL, 0);
return OMPI_SUCCESS;
}

Expand Down
10 changes: 6 additions & 4 deletions ompi/mca/pml/ucx/pml_ucx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@ extern mca_pml_ucx_module_t ompi_pml_ucx;
_PML_UCX_QUOTE(_x)

#define PML_UCX_ERROR(...) \
opal_output_verbose(0, ompi_pml_ucx.output, "Error: " __FILE__ ":" \
PML_UCX_QUOTE(__LINE__) __VA_ARGS__)
opal_output_verbose(0, ompi_pml_ucx.output, \
__FILE__ ":" PML_UCX_QUOTE(__LINE__) \
" Error: " __VA_ARGS__)

#define PML_UCX_VERBOSE(_level, ... ) \
if (((_level) <= PML_UCX_MAX_VERBOSE) && ((_level) <= ompi_pml_ucx.verbose)) { \
opal_output_verbose(_level, ompi_pml_ucx.output, __FILE__ ":" \
PML_UCX_QUOTE(__LINE__) __VA_ARGS__); \
opal_output_verbose(_level, ompi_pml_ucx.output, \
__FILE__ ":" PML_UCX_QUOTE(__LINE__) " " \
__VA_ARGS__); \
}

int mca_pml_ucx_open(void);
Expand Down
4 changes: 2 additions & 2 deletions ompi/mca/pml/ucx/pml_ucx_request.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,10 @@ static void mca_pml_ucx_request_init_common(ompi_request_t* ompi_req,
ompi_request_free_fn_t req_free,
ompi_request_cancel_fn_t req_cancel)
{
OBJ_CONSTRUCT(ompi_req, ompi_request_t);
OMPI_REQUEST_INIT(ompi_req, req_persistent);
ompi_req->req_type = OMPI_REQUEST_PML;
ompi_req->req_state = state;
ompi_req->req_complete_cb = NULL;
ompi_req->req_complete_cb_data = NULL;
ompi_req->req_free = req_free;
ompi_req->req_cancel = req_cancel;
}
Expand All @@ -128,6 +127,7 @@ void mca_pml_ucx_request_cleanup(void *request)
{
ompi_request_t* ompi_req = request;
OMPI_REQUEST_FINI(ompi_req);
OBJ_DESTRUCT(ompi_req);
}

static int mca_pml_ucx_persistent_request_free(ompi_request_t **rptr)
Expand Down