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 83253a41423d0f30317f6de93560a6cec8e5a069 (commit) from 9c4b9b172428fa991ff6e7904d96b57e28fb24c7 (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/83253a41423d0f30317f6de93560a6cec8... commit 83253a41423d0f30317f6de93560a6cec8e5a069 Author: Rob Latham <[email protected]> Date: Mon Jun 15 14:51:28 2015 -0500 some type promotions in RMA path Signed-off-by: Xin Zhao <[email protected]> diff --git a/src/mpid/ch3/include/mpid_rma_shm.h b/src/mpid/ch3/include/mpid_rma_shm.h index f6d6b78..31417a0 100644 --- a/src/mpid/ch3/include/mpid_rma_shm.h +++ b/src/mpid/ch3/include/mpid_rma_shm.h @@ -10,8 +10,8 @@ #include "mpl_utlist.h" #include "mpid_rma_types.h" -static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datatype source_dtp, - void *target_buf, int target_count, MPI_Datatype target_dtp, +static inline int do_accumulate_op(void *source_buf, MPI_Aint source_count, MPI_Datatype source_dtp, + void *target_buf, MPI_Aint target_count, MPI_Datatype target_dtp, MPI_Aint stream_offset, MPI_Op acc_op); #define ASSIGN_COPY(src, dest, count, type) \ diff --git a/src/mpid/ch3/include/mpid_rma_types.h b/src/mpid/ch3/include/mpid_rma_types.h index 120b9dd..a456d2f 100644 --- a/src/mpid/ch3/include/mpid_rma_types.h +++ b/src/mpid/ch3/include/mpid_rma_types.h @@ -26,10 +26,10 @@ enum MPIDI_RMA_Datatype { /* to send derived datatype across in RMA ops */ typedef struct MPIDI_RMA_dtype_info { /* for derived datatypes */ int is_contig; - int max_contig_blocks; + MPI_Aint max_contig_blocks; MPI_Aint size; MPI_Aint extent; - int dataloop_size; /* not needed because this info is sent in + MPI_Aint dataloop_size; /* not needed because this info is sent in * packet header. remove it after lock/unlock * is implemented in the device */ void *dataloop; /* pointer needed to update pointers @@ -61,7 +61,7 @@ typedef struct MPIDI_RMA_Op { MPI_Datatype result_datatype; struct MPID_Request **reqs; - int reqs_size; + MPI_Aint reqs_size; MPIDI_RMA_dtype_info dtype_info; void *dataloop; diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index bfaa7a7..968f189 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -806,8 +806,8 @@ static inline int MPIDI_CH3I_RMA_Handle_flush_ack(MPID_Win * win_ptr, int target #define FUNCNAME do_accumulate_op #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datatype source_dtp, - void *target_buf, int target_count, MPI_Datatype target_dtp, +static inline int do_accumulate_op(void *source_buf, MPI_Aint source_count, MPI_Datatype source_dtp, + void *target_buf, MPI_Aint target_count, MPI_Datatype target_dtp, MPI_Aint stream_offset, MPI_Op acc_op) { int mpi_errno = MPI_SUCCESS; ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpid_rma_shm.h | 4 ++-- src/mpid/ch3/include/mpid_rma_types.h | 6 +++--- src/mpid/ch3/include/mpidrma.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository