Commit fd5d8ad2 authored by Matthieu Dorier's avatar Matthieu Dorier

corrected some issues related to non-matching sizes

parent 2a74260a
...@@ -643,10 +643,12 @@ static int rm_matching_send(nw_state * ns, ...@@ -643,10 +643,12 @@ static int rm_matching_send(nw_state * ns,
int index = 0; int index = 0;
qlist_for_each(ent, &ns->arrival_queue){ qlist_for_each(ent, &ns->arrival_queue){
qi = qlist_entry(ent, mpi_msgs_queue, ql); qi = qlist_entry(ent, mpi_msgs_queue, ql);
if((qi->num_bytes == qitem->num_bytes) if(//(qi->num_bytes == qitem->num_bytes) // it is not a requirement in MPI that the send and receive sizes match
&& (qi->tag == qitem->tag || qitem->tag == -1) // &&
(qi->tag == qitem->tag || qitem->tag == -1)
&& ((qi->source_rank == qitem->source_rank) || qitem->source_rank == -1)) && ((qi->source_rank == qitem->source_rank) || qitem->source_rank == -1))
{ {
qitem->num_bytes = qi->num_bytes;
matched = 1; matched = 1;
break; break;
} }
......
...@@ -699,7 +699,7 @@ int dumpi_trace_nw_workload_load(const char* params, int app_id, int rank) ...@@ -699,7 +699,7 @@ int dumpi_trace_nw_workload_load(const char* params, int app_id, int rank)
callbacks.on_recv_init = (dumpi_recv_init_call)handleDUMPIIgnore; callbacks.on_recv_init = (dumpi_recv_init_call)handleDUMPIIgnore;
callbacks.on_start = (dumpi_start_call)handleDUMPIIgnore; callbacks.on_start = (dumpi_start_call)handleDUMPIIgnore;
callbacks.on_startall = (dumpi_startall_call)handleDUMPIIgnore; callbacks.on_startall = (dumpi_startall_call)handleDUMPIIgnore;
callbacks.on_sendrecv = (dumpi_sendrecv_call)handleDUMPIIgnore; callbacks.on_sendrecv = (dumpi_sendrecv_call)handleDUMPISendrecv;
callbacks.on_sendrecv_replace = (dumpi_sendrecv_replace_call)handleDUMPIIgnore; callbacks.on_sendrecv_replace = (dumpi_sendrecv_replace_call)handleDUMPIIgnore;
callbacks.on_type_contiguous = (dumpi_type_contiguous_call)handleDUMPIIgnore; callbacks.on_type_contiguous = (dumpi_type_contiguous_call)handleDUMPIIgnore;
callbacks.on_barrier = (dumpi_barrier_call)handleDUMPIIgnore; callbacks.on_barrier = (dumpi_barrier_call)handleDUMPIIgnore;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment