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 5addea2c60bd4b00568e624491d327dc3675a5c0 (commit) via e01a20b6e78b73788b26a3a62fc676ae11c6e439 (commit) via be82b6a78f23e3f550e7461682587bef13d60ee0 (commit) via e7eab9df185a2a0075e177a915fa1d269fe840b2 (commit) from 08c52c2e268bc4721eaba289bef121ccc67cfe58 (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/5addea2c60bd4b00568e624491d327dc36... commit 5addea2c60bd4b00568e624491d327dc3675a5c0 Author: Pavan Balaji <[email protected]> Date: Thu Apr 9 12:27:42 2015 -0500 Update .gitignore. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index 8020972..0886a79 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -101,8 +101,9 @@ /coll/scatterv /coll/scattern /coll/rerr -/coll/bcast2 -/coll/bcast3 +/coll/bcast_full +/coll/bcast_min_datatypes +/coll/bcast_comm_world /coll/exscan2 /coll/exscan /coll/icallgather http://git.mpich.org/mpich.git/commitdiff/e01a20b6e78b73788b26a3a62fc676ae11... commit e01a20b6e78b73788b26a3a62fc676ae11c6e439 Author: Pavan Balaji <[email protected]> Date: Wed Apr 8 18:55:34 2015 -0500 Simplify the bcast test. The current number of combinations we are checking are too many, causing the test to take too long on some platforms. This patch simplifies the test, so we build two versions of the test. In the first version, we run only on COMM_WORLD but go through all datatypes. In the second version, we run on all communicators, but go through only a small subset of datatypes. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/test/mpi/coll/Makefile.am b/test/mpi/coll/Makefile.am index 471f52f..0ab3079 100644 --- a/test/mpi/coll/Makefile.am +++ b/test/mpi/coll/Makefile.am @@ -31,7 +31,9 @@ noinst_PROGRAMS = \ alltoallw1 \ alltoallw2 \ alltoallw_zeros \ - bcast \ + bcast_full \ + bcast_min_datatypes \ + bcast_comm_world \ bcasttest \ bcastzerotype \ coll2 \ @@ -108,6 +110,14 @@ noinst_PROGRAMS = \ allgatherv4_LDADD = $(LDADD) -lm +bcast_full_SOURCES = bcast.c + +bcast_min_datatypes_CPPFLAGS = -DBCAST_MIN_DATATYPES_ONLY $(AM_CPPFLAGS) +bcast_min_datatypes_SOURCES = bcast.c + +bcast_comm_world_CPPFLAGS = -DBCAST_COMM_WORLD_ONLY $(AM_CPPFLAGS) +bcast_comm_world_SOURCES = bcast.c + # Create tests of the nonblocking collectives by reusing the blocking tests, # using the MPI profiling interface to intercept the blocking call and # replace it with a MPI_Ixxx/MPI_Wait pair. diff --git a/test/mpi/coll/bcast.c b/test/mpi/coll/bcast.c index 85a51c1..993bdfb 100644 --- a/test/mpi/coll/bcast.c +++ b/test/mpi/coll/bcast.c @@ -30,6 +30,11 @@ int main(int argc, char *argv[]) if (comm == MPI_COMM_NULL) continue; +#if defined BCAST_COMM_WORLD_ONLY + if (comm != MPI_COMM_WORLD) + continue; +#endif /* BCAST_COMM_WORLD_ONLY */ + /* Determine the sender and receiver */ MPI_Comm_rank(comm, &rank); MPI_Comm_size(comm, &size); @@ -42,9 +47,9 @@ int main(int argc, char *argv[]) /* To shorten test time, only run the default version of datatype tests * for comm world and run the minimum version for other communicators. */ - if (comm != MPI_COMM_WORLD) { - MTestInitMinDatatypes(); - } +#if defined BCAST_MIN_DATATYPES_ONLY + MTestInitMinDatatypes(); +#endif /* BCAST_MIN_DATATYPES_ONLY */ while (MTestGetDatatypes(&sendtype, &recvtype, count)) { for (root = 0; root < size; root++) { diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index 832b505..61ad2a3 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -32,10 +32,11 @@ allgatherv4 4 timeLimit=600 bcasttest 4 bcasttest 8 bcasttest 10 -bcast 4 +bcast_full 4 # More that 8 processes are required to get bcast to switch to the long # msg algorithm (see coll definitions in mpiimpl.h) -bcast 10 timeLimit=1500 +bcast_min_datatypes 10 timeLimit=1200 +bcast_comm_world 10 timeLimit=1200 bcastzerotype 1 bcastzerotype 4 bcastzerotype 5 http://git.mpich.org/mpich.git/commitdiff/be82b6a78f23e3f550e7461682587bef13... commit be82b6a78f23e3f550e7461682587bef13d60ee0 Author: Pavan Balaji <[email protected]> Date: Wed Apr 8 18:44:00 2015 -0500 Cosmetic changes to the bcast2 test. 1. Renamed bcast2 to bcast. 2. White-space cleanup for bcast.c Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/test/mpi/coll/Makefile.am b/test/mpi/coll/Makefile.am index 28ac6e4..471f52f 100644 --- a/test/mpi/coll/Makefile.am +++ b/test/mpi/coll/Makefile.am @@ -31,7 +31,7 @@ noinst_PROGRAMS = \ alltoallw1 \ alltoallw2 \ alltoallw_zeros \ - bcast2 \ + bcast \ bcasttest \ bcastzerotype \ coll2 \ diff --git a/test/mpi/coll/bcast.c b/test/mpi/coll/bcast.c new file mode 100644 index 0000000..85a51c1 --- /dev/null +++ b/test/mpi/coll/bcast.c @@ -0,0 +1,86 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2003 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include "mpi.h" +#include <stdio.h> +#include "mpitest.h" + +/* +static char MTEST_Descrip[] = "Test of broadcast with various roots and datatypes"; +*/ + +int main(int argc, char *argv[]) +{ + int errs = 0, err; + int rank, size, root; + int minsize = 2, count; + MPI_Comm comm; + MTestDatatype sendtype, recvtype; + + MTest_Init(&argc, &argv); + + /* The following illustrates the use of the routines to + * run through a selection of communicators and datatypes. + * Use subsets of these for tests that do not involve combinations + * of communicators, datatypes, and counts of datatypes */ + while (MTestGetIntracommGeneral(&comm, minsize, 1)) { + if (comm == MPI_COMM_NULL) + continue; + + /* Determine the sender and receiver */ + MPI_Comm_rank(comm, &rank); + MPI_Comm_size(comm, &size); + + /* To improve reporting of problems about operations, we + * change the error handler to errors return */ + MPI_Errhandler_set(comm, MPI_ERRORS_RETURN); + + MTEST_DATATYPE_FOR_EACH_COUNT(count) { + + /* To shorten test time, only run the default version of datatype tests + * for comm world and run the minimum version for other communicators. */ + if (comm != MPI_COMM_WORLD) { + MTestInitMinDatatypes(); + } + + while (MTestGetDatatypes(&sendtype, &recvtype, count)) { + for (root = 0; root < size; root++) { + if (rank == root) { + sendtype.InitBuf(&sendtype); + err = MPI_Bcast(sendtype.buf, sendtype.count, + sendtype.datatype, root, comm); + if (err) { + errs++; + MTestPrintError(err); + } + } + else { + recvtype.InitBuf(&recvtype); + err = MPI_Bcast(recvtype.buf, recvtype.count, + recvtype.datatype, root, comm); + if (err) { + errs++; + fprintf(stderr, "Error with communicator %s and datatype %s\n", + MTestGetIntracommName(), MTestGetDatatypeName(&recvtype)); + MTestPrintError(err); + } + err = MTestCheckRecv(0, &recvtype); + if (err) { + errs += errs; + } + } + } + MTestFreeDatatype(&recvtype); + MTestFreeDatatype(&sendtype); + } + } + MTestFreeComm(&comm); + } + + MTest_Finalize(errs); + MPI_Finalize(); + return 0; +} diff --git a/test/mpi/coll/bcast2.c b/test/mpi/coll/bcast2.c deleted file mode 100644 index 40054cd..0000000 --- a/test/mpi/coll/bcast2.c +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * - * (C) 2003 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ -#include "mpi.h" -#include <stdio.h> -#include "mpitest.h" - -/* -static char MTEST_Descrip[] = "Test of broadcast with various roots and datatypes"; -*/ - -int main( int argc, char *argv[] ) -{ - int errs = 0, err; - int rank, size, root; - int minsize = 2, count; - MPI_Comm comm; - MTestDatatype sendtype, recvtype; - - MTest_Init( &argc, &argv ); - - /* The following illustrates the use of the routines to - run through a selection of communicators and datatypes. - Use subsets of these for tests that do not involve combinations - of communicators, datatypes, and counts of datatypes */ - while (MTestGetIntracommGeneral( &comm, minsize, 1 )) { - if (comm == MPI_COMM_NULL) continue; - - /* Determine the sender and receiver */ - MPI_Comm_rank( comm, &rank ); - MPI_Comm_size( comm, &size ); - - /* To improve reporting of problems about operations, we - change the error handler to errors return */ - MPI_Errhandler_set( comm, MPI_ERRORS_RETURN ); - - MTEST_DATATYPE_FOR_EACH_COUNT(count) { - - /* To shorten test time, only run the default version of datatype tests - * for comm world and run the minimum version for other communicators. */ - if (comm != MPI_COMM_WORLD) { - MTestInitMinDatatypes(); - } - - while (MTestGetDatatypes( &sendtype, &recvtype, count )) { - for (root=0; root<size; root++) { - if (rank == root) { - sendtype.InitBuf( &sendtype ); - err = MPI_Bcast( sendtype.buf, sendtype.count, - sendtype.datatype, root, comm ); - if (err) { - errs++; - MTestPrintError( err ); - } - } - else { - recvtype.InitBuf( &recvtype ); - err = MPI_Bcast( recvtype.buf, recvtype.count, - recvtype.datatype, root, comm ); - if (err) { - errs++; - fprintf( stderr, "Error with communicator %s and datatype %s\n", - MTestGetIntracommName(), - MTestGetDatatypeName( &recvtype ) ); - MTestPrintError( err ); - } - err = MTestCheckRecv( 0, &recvtype ); - if (err) { - errs += errs; - } - } - } - MTestFreeDatatype( &recvtype ); - MTestFreeDatatype( &sendtype ); - } - } - MTestFreeComm( &comm ); - } - - MTest_Finalize( errs ); - MPI_Finalize(); - return 0; -} diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index 24f6a91..832b505 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -32,10 +32,10 @@ allgatherv4 4 timeLimit=600 bcasttest 4 bcasttest 8 bcasttest 10 -bcast2 4 +bcast 4 # More that 8 processes are required to get bcast to switch to the long # msg algorithm (see coll definitions in mpiimpl.h) -bcast2 10 timeLimit=1500 +bcast 10 timeLimit=1500 bcastzerotype 1 bcastzerotype 4 bcastzerotype 5 http://git.mpich.org/mpich.git/commitdiff/e7eab9df185a2a0075e177a915fa1d269f... commit e7eab9df185a2a0075e177a915fa1d269fe840b2 Author: Pavan Balaji <[email protected]> Date: Wed Apr 8 18:42:25 2015 -0500 Get rid of bcast3.c This test is exactly the same as bcast2. Originally these two tests were different, but over time they have become essentially the same. There's no point testing the same thing twice. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/test/mpi/coll/Makefile.am b/test/mpi/coll/Makefile.am index 98264a4..28ac6e4 100644 --- a/test/mpi/coll/Makefile.am +++ b/test/mpi/coll/Makefile.am @@ -32,7 +32,6 @@ noinst_PROGRAMS = \ alltoallw2 \ alltoallw_zeros \ bcast2 \ - bcast3 \ bcasttest \ bcastzerotype \ coll2 \ diff --git a/test/mpi/coll/bcast3.c b/test/mpi/coll/bcast3.c deleted file mode 100644 index 2da4bf8..0000000 --- a/test/mpi/coll/bcast3.c +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * - * (C) 2003 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ -#include "mpi.h" -#include <stdio.h> -#include "mpitest.h" - -/* -static char MTEST_Descrip[] = "Test of broadcast with various roots and datatypes and sizes that are not powers of two"; -*/ - -int main( int argc, char *argv[] ) -{ - int errs = 0, err; - int rank, size, root; - int minsize = 2, count; - MPI_Comm comm; - MTestDatatype sendtype, recvtype; - - MTest_Init( &argc, &argv ); - - /* The following illustrates the use of the routines to - run through a selection of communicators and datatypes. - Use subsets of these for tests that do not involve combinations - of communicators, datatypes, and counts of datatypes */ - while (MTestGetIntracommGeneral( &comm, minsize, 1 )) { - if (comm == MPI_COMM_NULL) continue; - /* Determine the sender and receiver */ - MPI_Comm_rank( comm, &rank ); - MPI_Comm_size( comm, &size ); - - count = 1; - MTEST_DATATYPE_FOR_EACH_COUNT(count) { - - /* To shorten test time, only run the default version of datatype tests - * for comm world and run the minimum version for other communicators. */ - if (comm != MPI_COMM_WORLD) { - MTestInitMinDatatypes(); - } - - while (MTestGetDatatypes( &sendtype, &recvtype, count )) { - for (root=0; root<size; root++) { - if (rank == root) { - sendtype.InitBuf( &sendtype ); - err = MPI_Bcast( sendtype.buf, sendtype.count, - sendtype.datatype, root, comm ); - if (err) { - errs++; - MTestPrintError( err ); - } - } - else { - recvtype.InitBuf( &recvtype ); - err = MPI_Bcast( recvtype.buf, recvtype.count, - recvtype.datatype, root, comm ); - if (err) { - errs++; - fprintf( stderr, "Error with communicator %s and datatype %s\n", - MTestGetIntracommName(), - MTestGetDatatypeName( &recvtype ) ); - MTestPrintError( err ); - } - err = MTestCheckRecv( 0, &recvtype ); - if (err) { - errs += errs; - } - } - } - MTestFreeDatatype( &recvtype ); - MTestFreeDatatype( &sendtype ); - } - } - MTestFreeComm( &comm ); - } - - MTest_Finalize( errs ); - MPI_Finalize(); - return 0; -} diff --git a/test/mpi/coll/testlist b/test/mpi/coll/testlist index f776bc5..24f6a91 100644 --- a/test/mpi/coll/testlist +++ b/test/mpi/coll/testlist @@ -36,7 +36,6 @@ bcast2 4 # More that 8 processes are required to get bcast to switch to the long # msg algorithm (see coll definitions in mpiimpl.h) bcast2 10 timeLimit=1500 -bcast3 10 timeLimit=1500 bcastzerotype 1 bcastzerotype 4 bcastzerotype 5 ----------------------------------------------------------------------- Summary of changes: test/mpi/.gitignore | 5 +- test/mpi/coll/Makefile.am | 13 +++++- test/mpi/coll/bcast.c | 91 +++++++++++++++++++++++++++++++++++++++++++++ test/mpi/coll/bcast2.c | 86 ------------------------------------------ test/mpi/coll/bcast3.c | 82 ---------------------------------------- test/mpi/coll/testlist | 6 +- 6 files changed, 108 insertions(+), 175 deletions(-) create mode 100644 test/mpi/coll/bcast.c delete mode 100644 test/mpi/coll/bcast2.c delete mode 100644 test/mpi/coll/bcast3.c hooks/post-receive -- MPICH primary repository