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 771e558011e970d9336932806dd27cc735e7e6c1 (commit) from 47f92b7f4f1ca4f91bc93ba504a5b3b7ea74ddc3 (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/771e558011e970d9336932806dd27cc735... commit 771e558011e970d9336932806dd27cc735e7e6c1 Author: Lena Oden <[email protected]> Date: Fri Dec 11 18:06:56 2015 -0600 Fix handling of non-blocking collectives Due to the chnages from int to MPI_Aint for the function MPID_Sched_send_defer, also the type of the corresponding parameters in iscatter and igather had to be changed Signed-off-by: Rob Latham <[email protected]> diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index abebbe6..b8ccc8e 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -31,14 +31,16 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, vo /* helper callbacks and associated state structures */ struct shared_state { int recvtype; - int curr_count; - int last_recv_count; + MPI_Aint curr_count; + MPI_Aint last_recv_count; MPI_Status status; }; static int get_count(MPID_Comm *comm, int tag, void *state) { struct shared_state *ss = state; - MPIR_Get_count_impl(&ss->status, ss->recvtype, &ss->last_recv_count); + int recv_count; + MPIR_Get_count_impl(&ss->status, ss->recvtype, &recv_count); + ss->last_recv_count = recv_count; ss->curr_count += ss->last_recv_count; return MPI_SUCCESS; } diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 42be2d7..5bec8c1 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -31,7 +31,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void struct shared_state { int sendcount; int curr_count; - int send_subtree_count; + MPI_Aint send_subtree_count; int nbytes; MPI_Status status; }; ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/iallgather.c | 8 +++++--- src/mpi/coll/iscatter.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository