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 1e8b428e5294512db56083890556a45a786787eb (commit) via 31d95ed7b18c47a56b28a35ad464a9ce96538fa8 (commit) via 68f8c7aa798f7009529f85d17aa2c9395320b5a8 (commit) via 5e67e4824d1d7f4c007f6860c6a628e6aac6ef63 (commit) from 23b08871308fa33af2706707a114efe0f3fd7516 (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/1e8b428e5294512db56083890556a45a78... commit 1e8b428e5294512db56083890556a45a786787eb Author: Rob Latham <[email protected]> Date: Wed Jun 17 16:35:54 2015 -0500 Update PAMI device for larger count types type promotions have resulted in a change to the device layer. Ref: 1767 Signed-off-by: Pavan Balaji <[email protected]> Signed-off-by: Sameh S Sharkawi <[email protected]> diff --git a/src/mpid/pamid/include/mpidi_datatypes.h b/src/mpid/pamid/include/mpidi_datatypes.h index d3e4797..11c07e2 100644 --- a/src/mpid/pamid/include/mpidi_datatypes.h +++ b/src/mpid/pamid/include/mpidi_datatypes.h @@ -278,7 +278,7 @@ struct MPIDI_Request MPIDI_MsgEnvelope envelope; void *userbuf; /**< User buffer */ - unsigned userbufcount; /**< Userbuf data count */ + MPI_Aint userbufcount; /**< Userbuf data count */ MPI_Datatype datatype; /**< Data type of message */ pami_task_t peer_pami; /**< The other guy's rank (in PAMI) */ unsigned peer_comm; /**< The other guy's rank (in the orig communicator) */ diff --git a/src/mpid/pamid/include/mpidi_prototypes.h b/src/mpid/pamid/include/mpidi_prototypes.h index f2e60ae..d12f241 100644 --- a/src/mpid/pamid/include/mpidi_prototypes.h +++ b/src/mpid/pamid/include/mpidi_prototypes.h @@ -59,11 +59,11 @@ void MPIDI_Recvq_insert_ool (MPID_Request *q,MPID_Request *e); /** \} */ void MPIDI_Buffer_copy(const void * const sbuf, - int scount, + MPI_Aint scount, MPI_Datatype sdt, int * smpi_errno, void * const rbuf, - int rcount, + MPI_Aint rcount, MPI_Datatype rdt, MPIDI_msg_sz_t * rsz, int * rmpi_errno); @@ -77,7 +77,7 @@ void MPIDI_RecvMsg_procnull(MPID_Comm * comm, unsigned is_blocking, MPI_Status * status, MPID_Request ** request); -void MPIDI_RecvMsg_Unexp(MPID_Request * rreq, void * buf, int count, MPI_Datatype datatype); +void MPIDI_RecvMsg_Unexp(MPID_Request * rreq, void * buf, MPI_Aint count, MPI_Datatype datatype); /** * \defgroup MPID_CALLBACKS MPID callbacks for communication diff --git a/src/mpid/pamid/src/mpid_buffer.c b/src/mpid/pamid/src/mpid_buffer.c index 2a4407b..9c21293 100644 --- a/src/mpid/pamid/src/mpid_buffer.c +++ b/src/mpid/pamid/src/mpid_buffer.c @@ -46,8 +46,8 @@ * \param[out] rmpi_errno Returns errors */ void MPIDI_Buffer_copy( - const void * const sbuf, int scount, MPI_Datatype sdt, int * smpi_errno, - void * const rbuf, int rcount, MPI_Datatype rdt, MPIDI_msg_sz_t * rsz, int * rmpi_errno) + const void * const sbuf, MPI_Aint scount, MPI_Datatype sdt, int * smpi_errno, + void * const rbuf, MPI_Aint rcount, MPI_Datatype rdt, MPIDI_msg_sz_t * rsz, int * rmpi_errno) { int sdt_contig; int rdt_contig; diff --git a/src/mpid/pamid/src/pt2pt/mpid_irecv.h b/src/mpid/pamid/src/pt2pt/mpid_irecv.h index 1160ad3..1f8d4bc 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_irecv.h +++ b/src/mpid/pamid/src/pt2pt/mpid_irecv.h @@ -44,7 +44,7 @@ */ static inline int MPID_Irecv_inline(void * buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int rank, int tag, diff --git a/src/mpid/pamid/src/pt2pt/mpid_isend.h b/src/mpid/pamid/src/pt2pt/mpid_isend.h index 1dc58af..b9e999b 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_isend.h +++ b/src/mpid/pamid/src/pt2pt/mpid_isend.h @@ -80,7 +80,7 @@ MPIDI_Context_local(MPID_Request * req) */ static inline int MPID_Isend_inline(const void * buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int rank, int tag, diff --git a/src/mpid/pamid/src/pt2pt/mpid_send.h b/src/mpid/pamid/src/pt2pt/mpid_send.h index 35acb1a..ce2f8f0 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_send.h +++ b/src/mpid/pamid/src/pt2pt/mpid_send.h @@ -43,7 +43,7 @@ */ static inline int MPID_Send_inline(const void * buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int rank, int tag, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recv.h b/src/mpid/pamid/src/pt2pt/mpidi_recv.h index aaa029b..211fbc3 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recv.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_recv.h @@ -135,7 +135,7 @@ MPIDI_Alloc_lock_inline(void **buf,size_t size) */ static inline int MPIDI_Recv(void * buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int rank, int tag, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c index 41914fc..7bdbfba 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c @@ -26,7 +26,7 @@ void MPIDI_RecvMsg_Unexp(MPID_Request * rreq, void * buf, - int count, + MPI_Aint count, MPI_Datatype datatype) { /* ------------------------------------------------------------ */ diff --git a/src/mpid/pamid/src/pt2pt/mpidi_send.h b/src/mpid/pamid/src/pt2pt/mpidi_send.h index ba65e68..b7ed74d 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_send.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_send.h @@ -74,7 +74,7 @@ MPIDI_SendDoneCB_inline(pami_context_t context, */ static inline int MPIDI_Send(const void * buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int rank, int tag, http://git.mpich.org/mpich.git/commitdiff/31d95ed7b18c47a56b28a35ad464a9ce96... commit 31d95ed7b18c47a56b28a35ad464a9ce96538fa8 Author: Rob Latham <[email protected]> Date: Tue Jun 16 17:17:03 2015 -0500 a "large contig" type despite promoting types throughout the gather path, still had one case of constructing structs with larger-than-int blocklens. solution: borrow BigMPI strategy and construct types-of-chunks to get around limitations. Ref: #1767 Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index d786c90..a6cf10d 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -4464,6 +4464,9 @@ int MPIR_Type_create_hindexed_block_impl(int count, int blocklength, int MPIR_Type_contiguous_impl(int count, MPI_Datatype old_type, MPI_Datatype *new_type_p); +int MPIR_Type_contiguous_x_impl(MPI_Count count, + MPI_Datatype old_type, + MPI_Datatype *new_type_p); void MPIR_Type_get_extent_impl(MPI_Datatype datatype, MPI_Aint *lb, MPI_Aint *extent); void MPIR_Type_get_true_extent_impl(MPI_Datatype datatype, MPI_Aint *true_lb, MPI_Aint *true_extent); void MPIR_Type_get_envelope_impl(MPI_Datatype datatype, int *num_integers, int *num_addresses, diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index e979ede..964546c 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -329,10 +329,16 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, blocks[0] = sendcount; struct_displs[0] = MPI_VOID_PTR_CAST_TO_MPI_AINT sendbuf; types[0] = sendtype; - blocks[1] = curr_cnt - nbytes; + /* check for overflow. work around int limits if needed*/ + if (curr_cnt - nbytes != (int)(curr_cnt - nbytes)) { + blocks[1] = 1; + MPIR_Type_contiguous_x_impl(curr_cnt - nbytes, + MPI_BYTE, &(types[1])); + } else { + MPIU_Assign_trunc(blocks[1], curr_cnt - nbytes, int); + types[1] = MPI_BYTE; + } struct_displs[1] = MPI_VOID_PTR_CAST_TO_MPI_AINT tmp_buf; - types[1] = MPI_BYTE; - mpi_errno = MPIR_Type_create_struct_impl(2, blocks, struct_displs, types, &tmp_type); if (mpi_errno) MPIU_ERR_POP(mpi_errno); @@ -348,6 +354,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); } MPIR_Type_free_impl(&tmp_type); + if (types[1] != MPI_BYTE) + MPIR_Type_free_impl(&types[1]); } break; diff --git a/src/mpi/datatype/type_contiguous.c b/src/mpi/datatype/type_contiguous.c index 91e6f00..ee4de6c 100644 --- a/src/mpi/datatype/type_contiguous.c +++ b/src/mpi/datatype/type_contiguous.c @@ -63,7 +63,53 @@ int MPIR_Type_contiguous_impl(int count, goto fn_exit; } +#undef FUNCNAME +#define FUNCNAME MPIR_Type_contiguous_x_impl +#undef FCNAME +#define FCNAME MPIU_QUOTE(FUNCNAME) +int MPIR_Type_contiguous_x_impl(MPI_Count count, + MPI_Datatype oldtype, + MPI_Datatype *newtype) +{ + /* to make 'count' fit MPI-3 type processing routines (which take integer + * counts), we construct a type consisting of N INT_MAX chunks followed by + * a remainder. e.g for a count of 4000000000 bytes you would end up with + * one 2147483647-byte chunk followed immediately by a 1852516353-byte + * chunk */ + MPI_Datatype chunks, remainder; + MPI_Aint lb, extent, disps[2]; + int blocklens[2]; + MPI_Datatype types[2]; + int mpi_errno; + + /* truly stupendously large counts will overflow an integer with this math, + * but that is a problem for a few decades from now. Sorry, few decades + * from now! */ + MPIU_Assert(count/INT_MAX == (int)(count/INT_MAX)); + int c = (int)(count/INT_MAX); /* OK to cast until 'count' is 256 bits */ + int r = count%INT_MAX; + + mpi_errno = MPIR_Type_vector_impl(c, INT_MAX, INT_MAX, oldtype, &chunks); + if (mpi_errno != MPI_SUCCESS) goto fn_fail; + mpi_errno = MPIR_Type_contiguous_impl(r, oldtype, &remainder); + if (mpi_errno != MPI_SUCCESS) goto fn_fail; + MPIR_Type_get_extent_impl(oldtype, &lb, &extent); + + blocklens[0] = 1; blocklens[1] = 1; + disps[0] = 0; disps[1] = c*extent*INT_MAX; + types[0] = chunks; types[1] = remainder; + + mpi_errno = MPIR_Type_create_struct_impl(2, blocklens, disps, types, newtype); + + MPIR_Type_free_impl(&chunks); + MPIR_Type_free_impl(&remainder); + +fn_exit: + return mpi_errno; +fn_fail: + goto fn_exit; +} #endif http://git.mpich.org/mpich.git/commitdiff/68f8c7aa798f7009529f85d17aa2c93953... commit 68f8c7aa798f7009529f85d17aa2c9395320b5a8 Author: Rob Latham <[email protected]> Date: Fri Jun 12 10:30:04 2015 -0500 promote more types to larger versions The ongoing march towards 64-bit clean continues. Address areas where large product of two ints might have overflowed. Ref: #1767 Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 1e18a17..d786c90 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -2850,7 +2850,7 @@ int MPID_Comm_revoke(MPID_Comm *comm, int is_remote); Communication @*/ -int MPID_Send( const void *buf, int count, MPI_Datatype datatype, +int MPID_Send( const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, MPID_Request **request ); @@ -2900,7 +2900,7 @@ int MPID_Rsend( const void *buf, int count, MPI_Datatype datatype, Communication @*/ -int MPID_Ssend( const void *buf, int count, MPI_Datatype datatype, +int MPID_Ssend( const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, MPID_Request **request ); @@ -2955,7 +2955,7 @@ int MPID_tBsend( const void *buf, int count, MPI_Datatype datatype, Communication @*/ -int MPID_Isend( const void *buf, int count, MPI_Datatype datatype, +int MPID_Isend( const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, MPID_Request **request ); @@ -3015,7 +3015,7 @@ int MPID_Issend( const void *buf, int count, MPI_Datatype datatype, Communication @*/ -int MPID_Recv( void *buf, int count, MPI_Datatype datatype, +int MPID_Recv( void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPID_Comm *comm, int context_offset, MPI_Status *status, MPID_Request **request ); @@ -3035,7 +3035,7 @@ int MPID_Recv( void *buf, int count, MPI_Datatype datatype, Communication @*/ -int MPID_Irecv( void *buf, int count, MPI_Datatype datatype, +int MPID_Irecv( void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPID_Comm *comm, int context_offset, MPID_Request **request ); @@ -3905,20 +3905,20 @@ int MPID_VCR_Get_lpid(MPID_VCR vcr, int * lpid_ptr); other internal operations. They are wrappers around MPID send/recv functions. They do sends/receives by setting the context offset to MPID_CONTEXT_INTRA(INTER)_COLL. */ -int MPIR_Localcopy(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype); +int MPIR_Localcopy(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, + void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype); int MPIC_Wait(MPID_Request * request_ptr, mpir_errflag_t *errflag); int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status); /* FT versions of te MPIC_ functions */ -int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, mpir_errflag_t *errflag); -int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, +int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPID_Comm *comm_ptr, MPI_Status *status, mpir_errflag_t *errflag); -int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, mpir_errflag_t *errflag); -int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - int dest, int sendtag, void *recvbuf, int recvcount, +int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, + int dest, int sendtag, void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype, int source, int recvtag, MPID_Comm *comm_ptr, MPI_Status *status, mpir_errflag_t *errflag); int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, @@ -4474,7 +4474,7 @@ int MPIR_Type_indexed_impl(int count, const int blocklens[], const int indices[] void MPIR_Type_free_impl(MPI_Datatype *datatype); int MPIR_Type_vector_impl(int count, int blocklength, int stride, MPI_Datatype old_type, MPI_Datatype *newtype_p); int MPIR_Type_struct_impl(int count, const int blocklens[], const MPI_Aint indices[], const MPI_Datatype old_types[], MPI_Datatype *newtype); -int MPIR_Pack_impl(const void *inbuf, int incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outcount, MPI_Aint *position); +int MPIR_Pack_impl(const void *inbuf, MPI_Aint incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outcount, MPI_Aint *position); void MPIR_Pack_size_impl(int incount, MPI_Datatype datatype, MPI_Aint *size); int MPIR_Unpack_impl(const void *inbuf, MPI_Aint insize, MPI_Aint *position, void *outbuf, int outcount, MPI_Datatype datatype); diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index ee6384f..e979ede 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -92,10 +92,12 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, int comm_size, rank; int mpi_errno = MPI_SUCCESS; int mpi_errno_ret = MPI_SUCCESS; - int curr_cnt=0, relative_rank, nbytes, is_homogeneous; - int mask, sendtype_size, recvtype_size, src, dst, relative_src; + int relative_rank, is_homogeneous; + int mask, src, dst, relative_src; + MPI_Aint curr_cnt=0, nbytes, sendtype_size, recvtype_size; int recvblks; - int tmp_buf_size, missing; + int missing; + MPI_Aint tmp_buf_size; void *tmp_buf=NULL; MPI_Status status; MPI_Aint extent=0; /* Datatype extent */ @@ -230,8 +232,11 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } } else if (nbytes < MPIR_CVAR_GATHER_VSMALL_MSG_SIZE) { - mpi_errno = MPIC_Recv(tmp_buf, recvblks * nbytes, MPI_BYTE, - src, MPIR_GATHER_TAG, comm_ptr, &status, errflag); + /* small transfer size case. cast ok */ + MPIU_Assert(recvblks*nbytes == (int)(recvblks*nbytes)); + mpi_errno = MPIC_Recv(tmp_buf, (int)(recvblks * nbytes), + MPI_BYTE, src, MPIR_GATHER_TAG, + comm_ptr, &status, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -267,7 +272,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } else /* Intermediate nodes store in temporary buffer */ { - int offset; + MPI_Aint offset; /* Estimate the amount of data that is going to come in */ recvblks = mask; @@ -505,7 +510,8 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, int rank, local_size, remote_size, mpi_errno=MPI_SUCCESS; int mpi_errno_ret = MPI_SUCCESS; - int i, nbytes, sendtype_size, recvtype_size; + int i; + MPI_Aint nbytes, sendtype_size, recvtype_size; MPI_Status status; MPI_Aint extent, true_extent, true_lb = 0; void *tmp_buf=NULL; @@ -825,7 +831,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* catch common aliasing cases */ if (recvbuf != MPI_IN_PLACE && sendtype == recvtype && sendcount == recvcount && sendcount != 0) { - int recvtype_size; + MPI_Aint recvtype_size; MPID_Datatype_get_size_macro(recvtype, recvtype_size); MPIR_ERRTEST_ALIAS_COLL(sendbuf, ((char *)recvbuf) + comm_ptr->rank*recvcount*recvtype_size,mpi_errno); } diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 62c81df..b78d6b6 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -47,8 +47,8 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) #define FUNCNAME MPIR_Localcopy #undef FCNAME #define FCNAME "MPIR_Localcopy" -int MPIR_Localcopy(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype) +int MPIR_Localcopy(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, + void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype) { int mpi_errno = MPI_SUCCESS; int sendtype_iscontig, recvtype_iscontig; @@ -268,7 +268,7 @@ int MPIC_Wait(MPID_Request * request_ptr, mpir_errflag_t *errflag) #define FUNCNAME MPIC_Send #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, mpir_errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -326,7 +326,7 @@ int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int t #define FUNCNAME MPIC_Recv #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, +int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPID_Comm *comm_ptr, MPI_Status *status, mpir_errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -384,7 +384,7 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, #define FUNCNAME MPIC_Ssend #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, mpir_errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -442,8 +442,8 @@ int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int #define FUNCNAME MPIC_Sendrecv #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - int dest, int sendtag, void *recvbuf, int recvcount, +int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, + int dest, int sendtag, void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype, int source, int recvtag, MPID_Comm *comm_ptr, MPI_Status *status, mpir_errflag_t *errflag) { diff --git a/src/mpi/datatype/pack.c b/src/mpi/datatype/pack.c index 01b007d..fba8b94 100644 --- a/src/mpi/datatype/pack.c +++ b/src/mpi/datatype/pack.c @@ -31,7 +31,7 @@ int MPI_Pack(const void *inbuf, int incount, MPI_Datatype datatype, void *outbuf #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int MPIR_Pack_impl(const void *inbuf, - int incount, + MPI_Aint incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outsize, diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 760827a..ddcc336 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -706,35 +706,35 @@ typedef struct MPIDI_Comm_ops /* Overriding calls in case of matching-capable interfaces */ int (*recv_posted)(struct MPIDI_VC *vc, struct MPID_Request *req); - int (*send)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*send)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request); - int (*rsend)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int (*rsend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, + int dest, int tag, MPID_Comm *comm, MPI_Aint context_offset, struct MPID_Request **request); - int (*ssend)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*ssend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request ); - int (*isend)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*isend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request ); - int (*irsend)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*irsend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request ); - int (*issend)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*issend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request ); - int (*send_init)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*send_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request ); int (*bsend_init)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request); - int (*rsend_init)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*rsend_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request ); - int (*ssend_init)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, + int (*ssend_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request ); int (*startall)(struct MPIDI_VC *vc, int count, struct MPID_Request *requests[]); @@ -803,7 +803,7 @@ typedef struct MPIDI_VC /* rendezvous function pointers. Called to send a rendevous message or when one is matched */ - int (* rndvSend_fn)( struct MPID_Request **sreq_p, const void * buf, int count, + int (* rndvSend_fn)( struct MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, MPIDI_msg_sz_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, struct MPID_Comm * comm, int context_offset ); @@ -1082,7 +1082,7 @@ const char * MPIDI_VC_GetStateString(int); /* Prototypes for internal device routines */ -int MPIDI_Isend_self(const void *, int, MPI_Datatype, int, int, MPID_Comm *, +int MPIDI_Isend_self(const void *, MPI_Aint, MPI_Datatype, int, int, MPID_Comm *, int, int, MPID_Request **); /*-------------------------- @@ -1578,7 +1578,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_i int *foundp); MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, int context_id, MPID_Comm *comm, void *user_buf, - int user_count, MPI_Datatype datatype, int * foundp); + MPI_Aint user_count, MPI_Datatype datatype, int * foundp); int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq); MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, int * found); @@ -1593,9 +1593,9 @@ int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq); int MPIDI_CH3U_Request_unpack_uebuf(MPID_Request * rreq); int MPIDI_CH3U_Request_unpack_srbuf(MPID_Request * rreq); -void MPIDI_CH3U_Buffer_copy(const void * const sbuf, int scount, +void MPIDI_CH3U_Buffer_copy(const void * const sbuf, MPI_Aint scount, MPI_Datatype sdt, int * smpi_errno, - void * const rbuf, int rcount, MPI_Datatype rdt, + void * const rbuf, MPI_Aint rcount, MPI_Datatype rdt, MPIDI_msg_sz_t * rdata_sz, int * rmpi_errno); int MPIDI_CH3U_Post_data_receive(int found, MPID_Request ** rreqp); int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreqp); @@ -1920,7 +1920,7 @@ int MPIDI_CH3_PktPrint_EagerSyncAck( FILE *fp, MPIDI_CH3_Pkt_t *pkt ); /* Routines to create packets (used in implementing MPI communications */ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, - const void *, int, + const void *, MPI_Aint, MPI_Datatype, MPIDI_msg_sz_t, int, int, MPID_Comm *, int ); int MPIDI_CH3_EagerContigSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, @@ -1948,7 +1948,7 @@ int MPIDI_CH3_SendNoncontig_iov( struct MPIDI_VC *vc, struct MPID_Request *sreq, /* Routines to ack packets, called in the receive routines when a message is matched */ int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *, MPID_Request * ); -int MPIDI_CH3_RecvFromSelf( MPID_Request *, void *, int, MPI_Datatype ); +int MPIDI_CH3_RecvFromSelf( MPID_Request *, void *, MPI_Aint, MPI_Datatype ); int MPIDI_CH3_RecvRndv( MPIDI_VC_t *, MPID_Request * ); /* Handler routines to continuing after an IOV is processed (assigned to the diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 390c5ea..11a32e3 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -364,7 +364,7 @@ typedef struct MPIDI_Request { /* user_buf, user_count, and datatype needed to process rendezvous messages. */ void *user_buf; - int user_count; + MPI_Aint user_count; MPI_Datatype datatype; int drop_data; diff --git a/src/mpid/ch3/src/ch3u_buffer.c b/src/mpid/ch3/src/ch3u_buffer.c index abee52d..bf4db2b 100644 --- a/src/mpid/ch3/src/ch3u_buffer.c +++ b/src/mpid/ch3/src/ch3u_buffer.c @@ -33,8 +33,8 @@ Used indirectly by mpid_irecv, mpid_recv (through MPIDI_CH3_RecvFromSelf) and #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) void MPIDI_CH3U_Buffer_copy( - const void * const sbuf, int scount, MPI_Datatype sdt, int * smpi_errno, - void * const rbuf, int rcount, MPI_Datatype rdt, MPIDI_msg_sz_t * rsz, + const void * const sbuf, MPI_Aint scount, MPI_Datatype sdt, int * smpi_errno, + void * const rbuf, MPI_Aint rcount, MPI_Datatype rdt, MPIDI_msg_sz_t * rsz, int * rmpi_errno) { int sdt_contig; @@ -226,7 +226,7 @@ void MPIDI_CH3U_Buffer_copy( * This routine is called by mpid_recv and mpid_irecv when a request * matches a send-to-self message */ -int MPIDI_CH3_RecvFromSelf( MPID_Request *rreq, void *buf, int count, +int MPIDI_CH3_RecvFromSelf( MPID_Request *rreq, void *buf, MPI_Aint count, MPI_Datatype datatype ) { MPID_Request * const sreq = rreq->partner_request; diff --git a/src/mpid/ch3/src/ch3u_eager.c b/src/mpid/ch3/src/ch3u_eager.c index 2f16890..38369ce 100644 --- a/src/mpid/ch3/src/ch3u_eager.c +++ b/src/mpid/ch3/src/ch3u_eager.c @@ -80,7 +80,7 @@ int MPIDI_CH3_SendNoncontig_iov( MPIDI_VC_t *vc, MPID_Request *sreq, /* MPIDI_CH3_EagerNoncontigSend - Eagerly send noncontiguous data */ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p, MPIDI_CH3_Pkt_type_t reqtype, - const void * buf, int count, + const void * buf, MPI_Aint count, MPI_Datatype datatype, MPIDI_msg_sz_t data_sz, int rank, int tag, MPID_Comm * comm, diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index e6c2c56..1f1bcfe 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -498,7 +498,7 @@ lock_exit: #define FCNAME MPIDI_QUOTE(FUNCNAME) MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, int context_id, MPID_Comm *comm, void *user_buf, - int user_count, MPI_Datatype datatype, int * foundp) + MPI_Aint user_count, MPI_Datatype datatype, int * foundp) { int mpi_errno = MPI_SUCCESS; int found = FALSE; diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c index e0cc472..5cb85ba 100644 --- a/src/mpid/ch3/src/mpid_irecv.c +++ b/src/mpid/ch3/src/mpid_irecv.c @@ -10,7 +10,7 @@ #define FUNCNAME MPID_Irecv #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPID_Irecv(void * buf, int count, MPI_Datatype datatype, int rank, int tag, +int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c index 11f60b8..b71933f 100644 --- a/src/mpid/ch3/src/mpid_isend.c +++ b/src/mpid/ch3/src/mpid_isend.c @@ -27,7 +27,7 @@ #define FUNCNAME MPID_Isend #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPID_Isend(const void * buf, int count, MPI_Datatype datatype, int rank, +int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c index 874f019..80d3fd9 100644 --- a/src/mpid/ch3/src/mpid_recv.c +++ b/src/mpid/ch3/src/mpid_recv.c @@ -10,7 +10,7 @@ #define FUNCNAME MPID_Recv #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPID_Recv(void * buf, int count, MPI_Datatype datatype, int rank, int tag, +int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, MPI_Status * status, MPID_Request ** request) { diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c index cf25242..21a8477 100644 --- a/src/mpid/ch3/src/mpid_send.c +++ b/src/mpid/ch3/src/mpid_send.c @@ -15,7 +15,7 @@ #define FUNCNAME MPID_Send #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPID_Send(const void * buf, int count, MPI_Datatype datatype, int rank, +int MPID_Send(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c index b3d735c..3944138 100644 --- a/src/mpid/ch3/src/mpid_ssend.c +++ b/src/mpid/ch3/src/mpid_ssend.c @@ -15,7 +15,7 @@ #define FUNCNAME MPID_Ssend #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPID_Ssend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, MPID_Request ** request) { MPIDI_msg_sz_t data_sz; diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c index 7521c68..453ab9e 100644 --- a/src/mpid/ch3/src/mpidi_isend_self.c +++ b/src/mpid/ch3/src/mpidi_isend_self.c @@ -16,7 +16,7 @@ #define FUNCNAME MPIDI_Isend_self #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPIDI_Isend_self(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, int type, MPID_Request ** request) { MPIDI_Message_match match; diff --git a/src/mpid/common/datatype/dataloop/segment_packunpack.c b/src/mpid/common/datatype/dataloop/segment_packunpack.c index 7a2ea88..86f9f00 100644 --- a/src/mpid/common/datatype/dataloop/segment_packunpack.c +++ b/src/mpid/common/datatype/dataloop/segment_packunpack.c @@ -321,7 +321,9 @@ int PREPEND_PREFIX(Segment_blkidx_m2m)(DLOOP_Offset *blocks_p, struct PREPEND_PREFIX(m2m_params) *paramp = v_paramp; DLOOP_Handle_get_size_macro(el_type, el_size); - DBG_SEGMENT(printf( "blkidx m2m: elsize = %d, count = %d, blocklen = %d\n", (int)el_size, (int)count, (int)blocklen )); + DBG_SEGMENT( printf("blkidx m2m: elsize = %ld, count = %ld, blocklen = %ld," + " blocks_left = %ld\n", + el_size, count, blocklen, blocks_left )); while (blocks_left) { char *src, *dest; @@ -335,11 +337,10 @@ int PREPEND_PREFIX(Segment_blkidx_m2m)(DLOOP_Offset *blocks_p, rel_off + offsetarray[curblock]); cbufp = (char*) paramp->userbuf + rel_off + offsetarray[curblock]; - /* Type-cast blocklen to a large type for comparison, but once - * we confirm that it is smaller than the blocks_left, we can - * safely type-cast blocks_left to a smaller type */ - if ((DLOOP_Offset) blocklen > blocks_left) - blocklen = (DLOOP_Count) blocks_left; + /* there was some casting going on here at one time but now all types + * are promoted ot big values */ + if ( blocklen > blocks_left) + blocklen = blocks_left; if (paramp->direction == DLOOP_M2M_TO_USERBUF) { src = paramp->streambuf; http://git.mpich.org/mpich.git/commitdiff/5e67e4824d1d7f4c007f6860c6a628e6aa... commit 5e67e4824d1d7f4c007f6860c6a628e6aac6ef63 Author: Rob Latham <[email protected]> Date: Fri Jun 12 10:28:57 2015 -0500 fixes for test case - preprocessor constants need parens - which showed the "always fail" case wasn't big enough - compiler warned about variables possibly being used uninitialized Ref: #1767 Signed-off-by: Pavan Balaji <[email protected]> diff --git a/test/mpi/coll/gather_big.c b/test/mpi/coll/gather_big.c index 58d15d3..7e6ccce 100644 --- a/test/mpi/coll/gather_big.c +++ b/test/mpi/coll/gather_big.c @@ -15,8 +15,8 @@ #define COUNT 1048576*32 #endif #if 1 -/* Following will fail always work for -n 8 unless gather path is 64 bit clean */ -#define COUNT 1048576*32+1 +/* Following will fail for -n 8 unless gather path is 64 bit clean */ +#define COUNT (1024*1024*128+1) #endif #define VERIFY_CONST 100000000L @@ -25,8 +25,8 @@ main(int argc, char *argv[]) { int rank, size; int i, j; - long *sendbuf; - long *recvbuf; + long *sendbuf=NULL; + long *recvbuf=NULL; MPI_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &rank); ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 29 +++++++------ src/mpi/coll/gather.c | 36 +++++++++++----- src/mpi/coll/helper_fns.c | 14 +++--- src/mpi/datatype/pack.c | 2 +- src/mpi/datatype/type_contiguous.c | 46 ++++++++++++++++++++ src/mpid/ch3/include/mpidimpl.h | 34 +++++++------- src/mpid/ch3/include/mpidpre.h | 2 +- src/mpid/ch3/src/ch3u_buffer.c | 6 +- src/mpid/ch3/src/ch3u_eager.c | 2 +- src/mpid/ch3/src/ch3u_recvq.c | 2 +- src/mpid/ch3/src/mpid_irecv.c | 2 +- src/mpid/ch3/src/mpid_isend.c | 2 +- src/mpid/ch3/src/mpid_recv.c | 2 +- src/mpid/ch3/src/mpid_send.c | 2 +- src/mpid/ch3/src/mpid_ssend.c | 2 +- src/mpid/ch3/src/mpidi_isend_self.c | 2 +- .../common/datatype/dataloop/segment_packunpack.c | 13 +++--- src/mpid/pamid/include/mpidi_datatypes.h | 2 +- src/mpid/pamid/include/mpidi_prototypes.h | 6 +- src/mpid/pamid/src/mpid_buffer.c | 4 +- src/mpid/pamid/src/pt2pt/mpid_irecv.h | 2 +- src/mpid/pamid/src/pt2pt/mpid_isend.h | 2 +- src/mpid/pamid/src/pt2pt/mpid_send.h | 2 +- src/mpid/pamid/src/pt2pt/mpidi_recv.h | 2 +- src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c | 2 +- src/mpid/pamid/src/pt2pt/mpidi_send.h | 2 +- test/mpi/coll/gather_big.c | 8 ++-- 27 files changed, 147 insertions(+), 83 deletions(-) hooks/post-receive -- MPICH primary repository