Skip to content

btl/openib: cuda: fix CUDA-aware support with async copy #463

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 1 commit into from
Mar 11, 2015
Merged

btl/openib: cuda: fix CUDA-aware support with async copy #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ompi/mca/pml/ob1/pml_ob1_recvreq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,8 @@ void mca_pml_ob1_recv_request_frag_copy_start( mca_pml_ob1_recv_request_t* recvr
bytes_delivered );
/* Store the receive request in unused context pointer. */
des->des_context = (void *)recvreq;
/* Store the amount of bytes in unused remote count value */
des->des_segment_count = bytes_delivered;
/* Store the amount of bytes in unused cbdata pointer */
des->des_cbdata = (void *) (intptr_t) bytes_delivered;
/* Then record an event that will get triggered by a PML progress call which
* checks the stream events. If we get an error, abort. Should get message
* from CUDA code about what went wrong. */
Expand All @@ -593,12 +593,12 @@ void mca_pml_ob1_recv_request_frag_copy_finished( mca_btl_base_module_t* btl,
int status )
{
mca_pml_ob1_recv_request_t* recvreq = (mca_pml_ob1_recv_request_t*)des->des_context;
size_t bytes_received = des->des_segment_count;
size_t bytes_received = (size_t) (intptr_t) des->des_cbdata;

OPAL_OUTPUT((-1, "frag_copy_finished (delivered=%d), frag=%p", (int)bytes_received, (void *)des));
/* Call into the BTL so it can free the descriptor. At this point, it is
* known that the data has been copied out of the descriptor. */
des->des_cbfunc(NULL, (struct mca_btl_base_endpoint_t *)des->des_cbdata, des, 0);
des->des_cbfunc(NULL, NULL, des, 0);

OPAL_THREAD_ADD_SIZE_T(&recvreq->req_bytes_received, bytes_received);

Expand Down
4 changes: 3 additions & 1 deletion opal/mca/btl/openib/btl_openib_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3071,7 +3071,7 @@ static int btl_openib_handle_incoming(mca_btl_openib_module_t *openib_btl,
* up callback for PML to call when complete, add argument into
* descriptor and return. */
des->des_cbfunc = btl_openib_handle_incoming_completion;
des->des_cbdata = (void *)ep;
to_in_frag(des)->endpoint = ep;
return OPAL_SUCCESS;
}
#endif /* OPAL_CUDA_SUPPORT */
Expand Down Expand Up @@ -3180,6 +3180,8 @@ static void btl_openib_handle_incoming_completion(mca_btl_base_module_t* btl,
int rqp = to_base_frag(frag)->base.order, cqp;
uint16_t rcredits = 0, credits;

ep = to_in_frag (des)->endpoint;

OPAL_OUTPUT((-1, "handle_incoming_complete frag=%p", (void *)des));

if(MCA_BTL_OPENIB_RDMA_FRAG(frag)) {
Expand Down