ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

PML UCX: handle a synchronous send.

Просмотр исходного кода 
MCA_PML_BASE_SEND_SYNCHRONOUS

Signed-off-by: Alina Sklarevich <alinas@mellanox.com>
Этот коммит содержится в:
Alina Sklarevich 2017-04-13 18:11:55 +03:00
родитель 38d712ab96
Коммит d93b67257b
1 изменённых файлов: 27 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

38
ompi/mca/pml/ucx/pml_ucx.c
Просмотреть файл

@ -661,6 +661,19 @@ mca_pml_ucx_bsend(ucp_ep_h ep, const void *buf, size_t count,
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
static ompi_request_t* mca_pml_ucx_tag_send_nb(ucp_ep_h ep, const void *buf,
size_t count, ucp_datatype_t datatype,
ucp_tag_t tag, mca_pml_base_send_mode_t mode)
{
if (OPAL_UNLIKELY(MCA_PML_BASE_SEND_SYNCHRONOUS == mode)) {
return (ompi_request_t*)ucp_tag_send_sync_nb(ep, buf, count, datatype,
tag, mca_pml_ucx_send_completion);
} else {
return (ompi_request_t*)ucp_tag_send_nb(ep, buf, count, datatype,
tag, mca_pml_ucx_send_completion);
}
}
int mca_pml_ucx_isend(const void *buf, size_t count, ompi_datatype_t *datatype, int mca_pml_ucx_isend(const void *buf, size_t count, ompi_datatype_t *datatype,
int dst, int tag, mca_pml_base_send_mode_t mode, int dst, int tag, mca_pml_base_send_mode_t mode,
struct ompi_communicator_t* comm, struct ompi_communicator_t* comm,
@ -674,8 +687,6 @@ int mca_pml_ucx_isend(const void *buf, size_t count, ompi_datatype_t *datatype,
mode == MCA_PML_BASE_SEND_BUFFERED ? "b" : "", mode == MCA_PML_BASE_SEND_BUFFERED ? "b" : "",
(void*)request) (void*)request)
/* TODO special care to sync/buffered send */
ep = mca_pml_ucx_get_ep(comm, dst); ep = mca_pml_ucx_get_ep(comm, dst);
if (OPAL_UNLIKELY(NULL == ep)) { if (OPAL_UNLIKELY(NULL == ep)) {
PML_UCX_ERROR("Failed to get ep for rank %d", dst); PML_UCX_ERROR("Failed to get ep for rank %d", dst);
@ -689,10 +700,9 @@ int mca_pml_ucx_isend(const void *buf, size_t count, ompi_datatype_t *datatype,
PML_UCX_MAKE_SEND_TAG(tag, comm)); PML_UCX_MAKE_SEND_TAG(tag, comm));
} }
req = (ompi_request_t*)ucp_tag_send_nb(ep, buf, count, req = mca_pml_ucx_tag_send_nb(ep, buf, count, mca_pml_ucx_get_datatype(datatype),
mca_pml_ucx_get_datatype(datatype), PML_UCX_MAKE_SEND_TAG(tag, comm), mode);
PML_UCX_MAKE_SEND_TAG(tag, comm),
mca_pml_ucx_send_completion);
if (req == NULL) { if (req == NULL) {
PML_UCX_VERBOSE(8, "returning completed request"); PML_UCX_VERBOSE(8, "returning completed request");
*request = &ompi_pml_ucx.completed_send_req; *request = &ompi_pml_ucx.completed_send_req;
@ -723,16 +733,15 @@ int mca_pml_ucx_send(const void *buf, size_t count, ompi_datatype_t *datatype, i
return OMPI_ERROR; return OMPI_ERROR;
} }
/* Special care to sync/buffered send */ /* Special care to buffered send */
if (OPAL_UNLIKELY(MCA_PML_BASE_SEND_BUFFERED == mode)) { if (OPAL_UNLIKELY(MCA_PML_BASE_SEND_BUFFERED == mode)) {
return mca_pml_ucx_bsend(ep, buf, count, datatype, return mca_pml_ucx_bsend(ep, buf, count, datatype,
PML_UCX_MAKE_SEND_TAG(tag, comm)); PML_UCX_MAKE_SEND_TAG(tag, comm));
} }
req = (ompi_request_t*)ucp_tag_send_nb(ep, buf, count, req = mca_pml_ucx_tag_send_nb(ep, buf, count, mca_pml_ucx_get_datatype(datatype),
mca_pml_ucx_get_datatype(datatype), PML_UCX_MAKE_SEND_TAG(tag, comm), mode);
PML_UCX_MAKE_SEND_TAG(tag, comm),
mca_pml_ucx_send_completion);
if (OPAL_LIKELY(req == NULL)) { if (OPAL_LIKELY(req == NULL)) {
return OMPI_SUCCESS; return OMPI_SUCCESS;
} else if (!UCS_PTR_IS_ERR(req)) { } else if (!UCS_PTR_IS_ERR(req)) {
@ -915,6 +924,13 @@ int mca_pml_ucx_start(size_t count, ompi_request_t** requests)
} }
/* pretend that we got immediate completion */ /* pretend that we got immediate completion */
tmp_req = NULL; tmp_req = NULL;
} else if (OPAL_UNLIKELY(MCA_PML_BASE_SEND_SYNCHRONOUS == preq->send.mode)) {
PML_UCX_VERBOSE(8, "start send sync request %p", (void*)preq);
tmp_req = (ompi_request_t*)ucp_tag_send_sync_nb(preq->send.ep,
preq->buffer,
preq->count, preq->datatype,
preq->tag,
mca_pml_ucx_psend_completion);
} else { } else {
PML_UCX_VERBOSE(8, "start send request %p", (void*)preq); PML_UCX_VERBOSE(8, "start send request %p", (void*)preq);
tmp_req = (ompi_request_t*)ucp_tag_send_nb(preq->send.ep, preq->buffer, tmp_req = (ompi_request_t*)ucp_tag_send_nb(preq->send.ep, preq->buffer,