This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 98b5e585a61a8eccbd0224b64c66c505fa5ddf0e (commit) from 4d8d25184cc87a2694ee808b560f1acb29447c59 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/98b5e585a61a8eccbd0224b64c66c505fa... commit 98b5e585a61a8eccbd0224b64c66c505fa5ddf0e Author: Nysal Jan K.A <[email protected]> Date: Thu May 22 18:53:02 2014 +0530 pamid: Allow message sizes greater than 4GB Allow message sizes >= 4GB Fixes #2076 Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c b/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c index e79e6a5..ec4569b 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c @@ -43,13 +43,14 @@ MPIDI_RendezvousTransfer(pami_context_t context, MPID_Request * rreq = (MPID_Request*) _rreq; void *rcvbuf; - unsigned rcvlen; + size_t rcvlen; /* -------------------------------------- */ /* calculate message length for reception */ /* calculate receive message "count" */ /* -------------------------------------- */ - unsigned dt_contig, dt_size; + unsigned dt_contig; + size_t dt_size; MPID_Datatype *dt_ptr; MPI_Aint dt_true_lb; MPIDI_Datatype_get_info(rreq->mpid.userbufcount, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c index 8c7f04b..2086e43 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c @@ -136,14 +136,14 @@ MPIDI_SendMsg_rzv(pami_context_t context, MPID_Request * sreq, pami_endpoint_t dest, void * sndbuf, - unsigned sndlen) + size_t sndlen) __attribute__((__noinline__)); static void MPIDI_SendMsg_rzv(pami_context_t context, MPID_Request * sreq, pami_endpoint_t dest, void * sndbuf, - unsigned sndlen) + size_t sndlen) { pami_result_t rc; @@ -166,7 +166,7 @@ MPIDI_SendMsg_rzv(pami_context_t context, &sreq->mpid.envelope.memregion); MPID_assert(rc == PAMI_SUCCESS); MPID_assert(sndlen == sndlen_out); - TRACE_ERR("RZV send for mr=%#llx addr=%p *addr[0]=%#016llx *addr[1]=%#016llx bytes=%u\n", + TRACE_ERR("RZV send for mr=%#llx addr=%p *addr[0]=%#016llx *addr[1]=%#016llx bytes=%zu\n", *(unsigned long long*)&sreq->mpid.envelope.memregion, sndbuf, *(((unsigned long long*)sndbuf)+0), @@ -189,7 +189,7 @@ MPIDI_SendMsg_rzv(pami_context_t context, if(rc == PAMI_SUCCESS) { MPID_assert(sndlen == sndlen_out); - TRACE_ERR("RZV send for mr=%#llx addr=%p *addr[0]=%#016llx *addr[1]=%#016llx bytes=%u\n", + TRACE_ERR("RZV send for mr=%#llx addr=%p *addr[0]=%#016llx *addr[1]=%#016llx bytes=%zu\n", *(unsigned long long*)&sreq->mpid.envelope.memregion, sndbuf, *(((unsigned long long*)sndbuf)+0), @@ -201,7 +201,7 @@ MPIDI_SendMsg_rzv(pami_context_t context, } else { - TRACE_ERR("RZV send (failed registration for sreq=%p addr=%p *addr[0]=%#016llx *addr[1]=%#016llx bytes=%u\n", + TRACE_ERR("RZV send (failed registration for sreq=%p addr=%p *addr[0]=%#016llx *addr[1]=%#016llx bytes=%zu\n", sreq,sndbuf, *(((unsigned long long*)sndbuf)+0), *(((unsigned long long*)sndbuf)+1), @@ -439,14 +439,14 @@ if (!TOKEN_FLOW_CONTROL_ON) { #endif const unsigned isLocal = PAMIX_Task_is_local(dest_tid); - const unsigned data_sz_limit = isSync?UINT_MAX:data_sz; + const size_t data_sz_limit = isSync?ULONG_MAX:data_sz; /* * Always use the short protocol when data_sz is small. */ if (likely(data_sz < MPIDI_PT2PT_SHORT_LIMIT(isInternal,isLocal))) { - TRACE_ERR("Sending(short%s%s) bytes=%u (short_limit=%u)\n", isInternal==1?",internal":"", isLocal==1?",intranode":"", data_sz, MPIDI_PT2PT_SHORT_LIMIT(isInternal,isLocal)); + TRACE_ERR("Sending(short%s%s) bytes=%zu (short_limit=%u)\n", isInternal==1?",internal":"", isLocal==1?",intranode":"", data_sz, MPIDI_PT2PT_SHORT_LIMIT(isInternal,isLocal)); MPIDI_SendMsg_short(context, sreq, dest, @@ -459,7 +459,7 @@ if (!TOKEN_FLOW_CONTROL_ON) { */ else if (data_sz_limit < MPIDI_PT2PT_EAGER_LIMIT(isInternal,isLocal)) { - TRACE_ERR("Sending(eager%s%s) bytes=%u (eager_limit=%u)\n", isInternal==1?",internal":"", isLocal==1?",intranode":"", data_sz, MPIDI_PT2PT_EAGER_LIMIT(isInternal,isLocal)); + TRACE_ERR("Sending(eager%s%s) bytes=%zu (eager_limit=%u)\n", isInternal==1?",internal":"", isLocal==1?",intranode":"", data_sz, MPIDI_PT2PT_EAGER_LIMIT(isInternal,isLocal)); MPIDI_SendMsg_eager(context, sreq, dest, @@ -479,7 +479,7 @@ if (!TOKEN_FLOW_CONTROL_ON) { */ else { - TRACE_ERR("Sending(rendezvous%s%s) bytes=%u (eager_limit=%u)\n", isInternal==1?",internal":"", isLocal==1?",intranode":"", data_sz, MPIDI_PT2PT_EAGER_LIMIT(isInternal,isLocal)); + TRACE_ERR("Sending(rendezvous%s%s) bytes=%zu (eager_limit=%u)\n", isInternal==1?",internal":"", isLocal==1?",intranode":"", data_sz, MPIDI_PT2PT_EAGER_LIMIT(isInternal,isLocal)); #ifdef OUT_OF_ORDER_HANDLING sreq->mpid.envelope.msginfo.noRDMA=isLocal; #endif ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c | 5 +++-- src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) hooks/post-receive -- MPICH primary repository