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 be899ea13f787849985f87e77758d5e25549aa54 (commit) from c8435ec4b080add9c4ec3c39ecabbc64d8321ecd (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/be899ea13f787849985f87e77758d5e255... commit be899ea13f787849985f87e77758d5e25549aa54 Author: Wesley Bland <[email protected]> Date: Fri Jun 27 11:05:58 2014 -0500 Fix redscat MPI_IN_PLACE checking The MPI_Reduce_scatter(_block) test was incorrectly checking the result and/or printing out incorrect values when detecting an error. This corrects that situation. Thanks for the patch from Jeff Hammond. Fixes #2087 Signed-off-by: Sangmin Seo <[email protected]> diff --git a/test/mpi/coll/redscat3.c b/test/mpi/coll/redscat3.c index 5efbd37..3b8e526 100644 --- a/test/mpi/coll/redscat3.c +++ b/test/mpi/coll/redscat3.c @@ -87,14 +87,14 @@ int main( int argc, char **argv ) sumval = size * rank + ((size - 1) * size)/2; /* recv'ed values for my process should be size * (rank + i) */ for (i=0; i<mycount; i++) { - if (sendbuf[i] != sumval) { - err++; - if (err < MAX_ERRORS) { - fprintf( stdout, "Did not get expected value for reduce scatter (in place)\n" ); - fprintf( stdout, "[%d] Got buf[%d] = %d expected %d\n", - rank, i, sendbuf[rank*mycount+i], sumval ); - } - } + if (sendbuf[i] != sumval) { + err++; + if (err < MAX_ERRORS) { + fprintf( stdout, "Did not get expected value for reduce scatter (in place)\n" ); + fprintf( stdout, "[%d] Got buf[%d] = %d expected %d\n", + rank, i, sendbuf[i], sumval ); + } + } } MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); diff --git a/test/mpi/coll/redscatblk3.c b/test/mpi/coll/redscatblk3.c index 5fb81e5..efb6d1e 100644 --- a/test/mpi/coll/redscatblk3.c +++ b/test/mpi/coll/redscatblk3.c @@ -71,11 +71,11 @@ int main( int argc, char **argv ) sumval = size * rank + ((size - 1) * size)/2; /* recv'ed values for my process should be size * (rank + i) */ for (i=0; i<mycount; i++) { - if (sendbuf[rank*mycount+i] != sumval) { - err++; - fprintf( stdout, "Did not get expected value for reduce scatter (in place)\n" ); - fprintf( stdout, "[%d] Got %d expected %d\n", rank, sendbuf[rank*mycount+i], sumval ); - } + if (sendbuf[i] != sumval) { + err++; + fprintf( stdout, "Did not get expected value for reduce scatter (in place)\n" ); + fprintf( stdout, "[%d] Got %d expected %d\n", rank, sendbuf[i], sumval ); + } } free(sendbuf); ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/redscat3.c | 16 ++++++++-------- test/mpi/coll/redscatblk3.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) hooks/post-receive -- MPICH primary repository