Skip to content

PML/UCX: reset converter stack on unordered messages #5175

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 3 commits into from
May 21, 2018
Merged

PML/UCX: reset converter stack on unordered messages #5175

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c5de01
PML/UCX: reset converter stack on unordered messages
May 17, 2018
19607da
PML/UCX: create convertor clone instead of stack reset
May 17, 2018
5ec2691
PML/UCX: do not set offset on ordered data recv
May 21, 2018
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
24 changes: 22 additions & 2 deletions ompi/mca/pml/ucx/pml_ucx_datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ static void* pml_ucx_generic_datatype_start_unpack(void *context, void *buffer,

OMPI_DATATYPE_RETAIN(datatype);
convertor->datatype = datatype;
convertor->offset = 0;
opal_convertor_copy_and_prepare_for_recv(ompi_proc_local_proc->super.proc_convertor,
&datatype->super, count, buffer, 0,
&convertor->opal_conv);
Expand Down Expand Up @@ -80,13 +81,32 @@ static ucs_status_t pml_ucx_generic_datatype_unpack(void *state, size_t offset,

uint32_t iov_count;
struct iovec iov;
opal_convertor_t conv;

iov_count = 1;
iov.iov_base = (void*)src;
iov.iov_len = length;

opal_convertor_set_position(&convertor->opal_conv, &offset);
opal_convertor_unpack(&convertor->opal_conv, &iov, &iov_count, &length);
/* in case if unordered message arrived - create separate convertor to
* unpack data. */
if (offset != convertor->offset) {
OBJ_CONSTRUCT(&conv, opal_convertor_t);
opal_convertor_copy_and_prepare_for_recv(ompi_proc_local_proc->super.proc_convertor,
&convertor->datatype->super,
convertor->opal_conv.count,
convertor->opal_conv.pBaseBuf, 0,
&conv);
opal_convertor_set_position(&conv, &offset);
opal_convertor_unpack(&conv, &iov, &iov_count, &length);
opal_convertor_cleanup(&conv);
OBJ_DESTRUCT(&conv);
/* permanently switch to un-ordered mode */
convertor->offset = 0;
} else {
opal_convertor_set_position(&convertor->opal_conv, &offset);
Copy link
Member

@bosilca bosilca May 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are here the convertor is already set at the right position, so the call to opal_convertor_set_position is unnecessary.

Copy link
Contributor Author

@hoopoepg hoopoepg May 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bosilca fixed

opal_convertor_unpack(&convertor->opal_conv, &iov, &iov_count, &length);
convertor->offset += length;
}
return UCS_OK;
}

Expand Down
1 change: 1 addition & 0 deletions ompi/mca/pml/ucx/pml_ucx_datatype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ struct pml_ucx_convertor {
opal_free_list_item_t super;
ompi_datatype_t *datatype;
opal_convertor_t opal_conv;
size_t offset;
};


Expand Down