1
1

Revert "PML/SPML/UCX: add UCX MT support to PML and SPML."

This reverts commit 0ecf3c951c0a87ab5bdd76a541a69852af671ba9.

Signed-off-by: Xin Zhao <xinz@mellanox.com>
Этот коммит содержится в:
Xin Zhao 2016-12-19 18:56:26 +02:00
родитель 0acdcebab2
Коммит 2d77912c19
2 изменённых файлов: 4 добавлений и 7 удалений

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

@ -134,14 +134,12 @@ int mca_pml_ucx_open(void)
UCP_PARAM_FIELD_REQUEST_SIZE |
UCP_PARAM_FIELD_REQUEST_INIT |
UCP_PARAM_FIELD_REQUEST_CLEANUP |
UCP_PARAM_FIELD_TAG_SENDER_MASK |
UCP_PARAM_FIELD_MT_WORKERS_SHARED;
UCP_PARAM_FIELD_TAG_SENDER_MASK;
params.features = UCP_FEATURE_TAG;
params.request_size = sizeof(ompi_request_t);
params.request_init = mca_pml_ucx_request_init;
params.request_cleanup = mca_pml_ucx_request_cleanup;
params.tag_sender_mask = PML_UCX_SPECIFIC_SOURCE_MASK;
params.mt_workers_shared = 0;
status = ucp_init(&params, config, &ompi_pml_ucx.ucp_context);
ucp_config_release(config);
@ -185,7 +183,7 @@ int mca_pml_ucx_init(void)
/* TODO check MPI thread mode */
params.field_mask = UCP_WORKER_PARAM_FIELD_THREAD_MODE;
params.thread_mode = UCS_THREAD_MODE_MULTI;
params.thread_mode = UCS_THREAD_MODE_SINGLE;
status = ucp_worker_create(ompi_pml_ucx.ucp_context, &params,
&ompi_pml_ucx.ucp_worker);

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

@ -127,8 +127,7 @@ static int mca_spml_ucx_component_open(void)
memset(&params, 0, sizeof(params));
params.field_mask = UCP_PARAM_FIELD_FEATURES;
params.features = UCP_FEATURE_RMA|UCP_FEATURE_AMO32|UCP_FEATURE_AMO64|UCP_PARAM_FIELD_MT_WORKERS_SHARED;
params.mt_workers_shared = 0;
params.features = UCP_FEATURE_RMA|UCP_FEATURE_AMO32|UCP_FEATURE_AMO64;
err = ucp_init(&params, ucp_config, &mca_spml_ucx.ucp_context);
ucp_config_release(ucp_config);
@ -154,7 +153,7 @@ static int spml_ucx_init(void)
ucs_status_t err;
params.field_mask = UCP_WORKER_PARAM_FIELD_THREAD_MODE;
params.thread_mode = UCS_THREAD_MODE_MULTI;
params.thread_mode = UCS_THREAD_MODE_SINGLE;
err = ucp_worker_create(mca_spml_ucx.ucp_context, &params,
&mca_spml_ucx.ucp_worker);