1
1

COMMON/UCX: added error code to log output

Also fixes a PGI compilation error with --enable-debug.

Signed-off-by: Geoff Paulsen <gpaulsen@users.noreply.github.com>
Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>
(cherry picked from commit 1099d5f02327329e0c58d9403e3e0a7f1e1d1920)
Этот коммит содержится в:
Sergey Oblomov 2018-10-21 11:37:25 +03:00 коммит произвёл Geoffrey Paulsen
родитель 660743cd3a
Коммит 0846c9d112
4 изменённых файлов: 18 добавлений и 4 удалений

Просмотреть файл

@ -193,7 +193,10 @@ int ompi_osc_ucx_complete(struct ompi_win_t *win) {
OSC_UCX_VERBOSE(1, "ucp_atomic_post failed: %d", status);
}
opal_common_ucx_ep_flush(ep, mca_osc_ucx_component.ucp_worker);
ret = opal_common_ucx_ep_flush(ep, mca_osc_ucx_component.ucp_worker);
if (OMPI_SUCCESS != ret) {
OSC_UCX_VERBOSE(1, "opal_common_ucx_ep_flush failed: %d", ret);
}
}
OBJ_RELEASE(module->start_group);

Просмотреть файл

@ -822,7 +822,10 @@ int ompi_osc_ucx_free(struct ompi_win_t *win) {
ucp_worker_progress(mca_osc_ucx_component.ucp_worker);
}
opal_common_ucx_worker_flush(mca_osc_ucx_component.ucp_worker);
ret = opal_common_ucx_worker_flush(mca_osc_ucx_component.ucp_worker);
if (OMPI_SUCCESS != ret) {
OSC_UCX_VERBOSE(1, "opal_common_ucx_worker_flush failed: %d", ret);
}
ret = module->comm->c_coll->coll_barrier(module->comm,
module->comm->c_coll->coll_barrier_module);

Просмотреть файл

@ -133,7 +133,7 @@ int mca_pml_ucx_datatype_attr_del_fn(ompi_datatype_t* datatype, int keyval,
{
ucp_datatype_t ucp_datatype = (ucp_datatype_t)attr_val;
PML_UCX_ASSERT((void*)ucp_datatype == datatype->pml_data);
PML_UCX_ASSERT((uint64_t)ucp_datatype == datatype->pml_data);
ucp_dt_destroy(ucp_datatype);
datatype->pml_data = PML_UCX_DATATYPE_INVALID;

Просмотреть файл

@ -80,6 +80,8 @@ OPAL_DECLSPEC void opal_common_ucx_mca_var_register(const mca_base_component_t *
OPAL_DECLSPEC void opal_common_ucx_mca_register(void)
{
int ret;
opal_common_ucx.registered++;
if (opal_common_ucx.registered > 1) {
/* process once */
@ -89,7 +91,13 @@ OPAL_DECLSPEC void opal_common_ucx_mca_register(void)
opal_common_ucx.output = opal_output_open(NULL);
opal_output_set_verbosity(opal_common_ucx.output, opal_common_ucx.verbose);
mca_base_framework_open(&opal_memory_base_framework, 0);
ret = mca_base_framework_open(&opal_memory_base_framework, 0);
if (OPAL_SUCCESS != ret) {
/* failed to initialize memory framework - just exit */
MCA_COMMON_UCX_VERBOSE(1, "failed to initialize memory base framework: %d, "
"memory hooks will not be used", ret);
return;
}
/* Set memory hooks */
if (opal_common_ucx.opal_mem_hooks &&