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

Fix yalla PML: Update previous commit after Yossofe's review

Просмотр исходного кода 
Signed-off-by: Nadia Derbey <Nadia.Derbey@atos.net>
Этот коммит содержится в:
Nadia Derbey 2017-04-06 07:58:26 +02:00
родитель b6de94e449
Коммит f918d88c3e
3 изменённых файлов: 39 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
ompi/mca/pml/yalla/pml_yalla.c
Просмотреть файл

@ -388,7 +388,7 @@ int mca_pml_yalla_recv(void *buf, size_t count, ompi_datatype_t *datatype, int s
rreq.completion.sender_imm, rreq.completion.sender_tag,
rreq.tag, rreq.tag_mask,
rreq.completion.actual_len);
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.actual_len, status, rc);
rc = PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.actual_len, status);
PML_YALLA_FREE_BLOCKING_MXM_REQ(&rreq.base);
return rc;
@ -532,7 +532,6 @@ int mca_pml_yalla_iprobe(int src, int tag, struct ompi_communicator_t* comm,
{
mxm_recv_req_t rreq;
mxm_error_t error;
int rc;
PML_YALLA_INIT_MXM_PROBE_REQ(&rreq, src, tag, comm);
@ -540,7 +539,7 @@ int mca_pml_yalla_iprobe(int src, int tag, struct ompi_communicator_t* comm,
switch (error) {
case MXM_OK:
*matched = 1;
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status, rc);
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status);
return OMPI_SUCCESS;
case MXM_ERR_NO_MESSAGE:
*matched = 0;
@ -557,14 +556,13 @@ int mca_pml_yalla_probe(int src, int tag, struct ompi_communicator_t* comm,
{
mxm_recv_req_t rreq;
mxm_error_t error;
int rc;
PML_YALLA_INIT_MXM_PROBE_REQ(&rreq, src, tag, comm);
for (;;) {
error = mxm_req_probe(&rreq);
switch (error) {
case MXM_OK:
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status, rc);
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status);
return OMPI_SUCCESS;
case MXM_ERR_NO_MESSAGE:
break;
@ -583,7 +581,6 @@ int mca_pml_yalla_improbe(int src, int tag, struct ompi_communicator_t* comm,
mxm_recv_req_t rreq;
mxm_message_h mxm_msg;
mxm_error_t error;
int rc;
PML_YALLA_INIT_MXM_PROBE_REQ(&rreq, src, tag, comm);
@ -591,7 +588,7 @@ int mca_pml_yalla_improbe(int src, int tag, struct ompi_communicator_t* comm,
switch (error) {
case MXM_OK:
*matched = 1;
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status, rc);
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status);
PML_YALLA_SET_MESSAGE(&rreq, comm, mxm_msg, message);
return OMPI_SUCCESS;
case MXM_ERR_NO_MESSAGE:
@ -611,14 +608,13 @@ int mca_pml_yalla_mprobe(int src, int tag, struct ompi_communicator_t* comm,
mxm_recv_req_t rreq;
mxm_message_h mxm_msg;
mxm_error_t error;
int rc;
PML_YALLA_INIT_MXM_PROBE_REQ(&rreq, src, tag, comm);
for (;;) {
error = mxm_req_mprobe(&rreq, &mxm_msg);
switch (error) {
case MXM_OK:
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status, rc);
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.sender_len, status);
PML_YALLA_SET_MESSAGE(&rreq, comm, mxm_msg, message);
return OMPI_SUCCESS;
case MXM_ERR_NO_MESSAGE:
@ -663,7 +659,6 @@ int mca_pml_yalla_mrecv(void *buf, size_t count, ompi_datatype_t *datatype,
{
mxm_recv_req_t rreq;
mxm_error_t error;
int rc;
PML_YALLA_INIT_MXM_RECV_REQ(&rreq, buf, count, datatype, -1, 0, (*message)->comm, recv);
PML_YALLA_INIT_BLOCKING_MXM_RECV_REQ(&rreq);
@ -684,8 +679,7 @@ int mca_pml_yalla_mrecv(void *buf, size_t count, ompi_datatype_t *datatype,
rreq.completion.sender_imm, rreq.completion.sender_tag,
rreq.tag, rreq.tag_mask,
rreq.completion.actual_len);
PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.actual_len, status, rc);
return rc;
return PML_YALLA_SET_RECV_STATUS(&rreq, rreq.completion.actual_len, status);
}
int mca_pml_yalla_start(size_t count, ompi_request_t** requests)

3
ompi/mca/pml/yalla/pml_yalla_request.c
Просмотреть файл

@ -195,10 +195,9 @@ static void mca_pml_yalla_bsend_completion_cb(void *context)
static void mca_pml_yalla_recv_completion_cb(void *context)
{
mca_pml_yalla_recv_request_t* rreq = context;
int rc;
PML_YALLA_SET_RECV_STATUS(&rreq->mxm, rreq->mxm.completion.actual_len,
&rreq->super.ompi.req_status, rc);
&rreq->super.ompi.req_status);
PML_YALLA_VERBOSE(8, "receive request %p completed with status %s source %d rtag %d(%d/0x%x) len %zu",
(void *)rreq, mxm_error_string(rreq->mxm.base.error),

58
ompi/mca/pml/yalla/pml_yalla_request.h
Просмотреть файл

@ -175,34 +175,40 @@ static inline mca_pml_yalla_send_request_t* MCA_PML_YALLA_SREQ_INIT(void *_buf,
} \
}
#define PML_YALLA_SET_RECV_STATUS(_rreq, _length, _mpi_status, rc) \
{ \
switch ((_rreq)->base.error) { \
case MXM_OK: \
(rc) = OMPI_SUCCESS; \
break; \
case MXM_ERR_CANCELED: \
(rc) = OMPI_SUCCESS; \
break; \
case MXM_ERR_MESSAGE_TRUNCATED: \
(rc) = MPI_ERR_TRUNCATE; \
break; \
default: \
(rc) = MPI_ERR_INTERN; \
break; \
} \
\
if ((_mpi_status) != MPI_STATUS_IGNORE) { \
(_mpi_status)->MPI_ERROR = (rc); \
if (MXM_ERR_CANCELED == (_rreq)->base.error) { \
(_mpi_status)->_cancelled = true; \
} \
(_mpi_status)->MPI_TAG = (_rreq)->completion.sender_tag; \
(_mpi_status)->MPI_SOURCE = (_rreq)->completion.sender_imm; \
(_mpi_status)->_ucount = (_length); \
} \
static inline int PML_YALLA_SET_RECV_STATUS(mxm_recv_req_t *_rreq,
size_t _length,
ompi_status_public_t *_mpi_status)
{
int rc;
switch (_rreq->base.error) {
case MXM_OK:
rc = OMPI_SUCCESS;
break;
case MXM_ERR_CANCELED:
rc = OMPI_SUCCESS;
break;
case MXM_ERR_MESSAGE_TRUNCATED:
rc = MPI_ERR_TRUNCATE;
break;
default:
rc = MPI_ERR_INTERN;
break;
}
/* If status is not ignored, fill what is needed */
if (_mpi_status != MPI_STATUS_IGNORE) {
_mpi_status->MPI_ERROR = rc;
if (MXM_ERR_CANCELED == _rreq->base.error) {
_mpi_status->_cancelled = true;
}
_mpi_status->MPI_TAG = _rreq->completion.sender_tag;
_mpi_status->MPI_SOURCE = _rreq->completion.sender_imm;
_mpi_status->_ucount = _length;
}
return rc;
}
#define PML_YALLA_SET_MESSAGE(_rreq, _comm, _mxm_msg, _message) \
{ \
*(_message) = ompi_message_alloc(); \