[mpich] MPICH primary repository branch, master, updated. v3.2b4-113-gf3984d8
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 f3984d8e88e84aedbdb776620833c2068b6bfe15 (commit) via 46ea748cff16d1aeb759fe92f9df097729b9d835 (commit) via 1ec0c2128d9e4dc1191062f6c4c672ce8e5d5aa4 (commit) from 79c28e9386b6b39e2e4451b8a6e06e30b930f386 (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/f3984d8e88e84aedbdb776620833c2068b... commit f3984d8e88e84aedbdb776620833c2068b6bfe15 Author: Yanfei Guo <[email protected]> Date: Thu Aug 13 11:40:19 2015 -0500 Clean up empty lines in comm_idup tests Signed-off-by: Lena Oden <[email protected]> diff --git a/test/mpi/comm/comm_idup.c b/test/mpi/comm/comm_idup.c index 4aa94ea..7958012 100644 --- a/test/mpi/comm/comm_idup.c +++ b/test/mpi/comm/comm_idup.c @@ -40,7 +40,6 @@ int main(int argc, char **argv) MPI_Abort(MPI_COMM_WORLD, 1); } - /* test plan: make rank 0 wait in a blocking recv until all other processes * have posted their MPI_Comm_idup ops, then post last. Should ensure that * idup doesn't block on the non-zero ranks, otherwise we'll get a deadlock. @@ -122,7 +121,6 @@ int main(int argc, char **argv) MPI_Comm_free(&newcomm); MPI_Comm_free(&ic); - MPI_Reduce((rank == 0 ? MPI_IN_PLACE : &errs), &errs, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); if (rank == 0) { if (errs) { diff --git a/test/mpi/comm/comm_idup_iallreduce.c b/test/mpi/comm/comm_idup_iallreduce.c index b42c64b..46be1e9 100644 --- a/test/mpi/comm/comm_idup_iallreduce.c +++ b/test/mpi/comm/comm_idup_iallreduce.c @@ -10,8 +10,8 @@ #include "mpi.h" #include "mpitest.h" - #define ITERS 10 + /* This test uses several scenarios to overlap iallreduce and comm_idup * 1.) Use comm_idup dublicate the COMM_WORLD and do iallreduce * on the COMM_WORLD @@ -30,8 +30,6 @@ * 9.) Communicate on the merge communicator, while duplicating COMM_WORLD */ - - int main(int argc, char **argv) { int errs = 0; @@ -76,10 +74,8 @@ int main(int argc, char **argv) MPI_Comm_free(&newcomm_v[i]); } - MPI_Comm_dup(MPI_COMM_WORLD, &dup_comm); - if (rank == 0) { MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &sreq[0]); MPI_Comm_idup(dup_comm, &newcomm, &sreq[1]); @@ -91,7 +87,6 @@ int main(int argc, char **argv) MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); } /* Test Iallreduce */ - if (sol != out) errs++; @@ -101,7 +96,6 @@ int main(int argc, char **argv) MPI_Comm_free(&newcomm); MPI_Comm_free(&dup_comm); - MPI_Comm_split(MPI_COMM_WORLD, rank % 2, rank, &split); MPI_Comm_rank(split, &lrank); MPI_Comm_size(split, &lsize); @@ -136,7 +130,6 @@ int main(int argc, char **argv) MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &sreq[0]); MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); } - /* Test Iallreduce */ if (sol != out) errs++;; @@ -180,7 +173,6 @@ int main(int argc, char **argv) errs += MTestTestComm(newcomm); MPI_Comm_free(&newcomm); - MPI_Intercomm_merge(ic, rank % 2, &merge); MPI_Comm_size(merge, &isize); diff --git a/test/mpi/comm/comm_idup_isend.c b/test/mpi/comm/comm_idup_isend.c index 4fe81ab..0eea1df 100644 --- a/test/mpi/comm/comm_idup_isend.c +++ b/test/mpi/comm/comm_idup_isend.c @@ -4,7 +4,6 @@ #include "mpi.h" #include "mpitest.h" - #define ITERS 4 int main(int argc, char **argv) @@ -25,7 +24,6 @@ int main(int argc, char **argv) MPI_Abort(MPI_COMM_WORLD, 1); } - sreq = (MPI_Request *) malloc(sizeof(MPI_Request) * (size + 1) * ITERS); while (MTestGetIntracommGeneral(&testcomm, 1, 1)) { @@ -51,7 +49,6 @@ int main(int argc, char **argv) MPI_Comm_idup(testcomm, &newcomm[j], &sreq[cnt++]); MPI_Irecv(&in[j], 1, MPI_INT, 0, 0, testcomm, &sreq[cnt++]); } - } MPI_Waitall(cnt, sreq, MPI_STATUS_IGNORE); @@ -87,7 +84,6 @@ int main(int argc, char **argv) MPI_Comm_idup(testcomm, &newcomm[j], &sreq[cnt++]); MPI_Irecv(&in[j], 1, MPI_INT, 0, 0, testcomm, &sreq[cnt++]); } - } MPI_Waitall(cnt, sreq, MPI_STATUS_IGNORE); diff --git a/test/mpi/comm/comm_idup_nb.c b/test/mpi/comm/comm_idup_nb.c index b4de5b9..8344fc6 100644 --- a/test/mpi/comm/comm_idup_nb.c +++ b/test/mpi/comm/comm_idup_nb.c @@ -10,11 +10,8 @@ #include "mpi.h" #include "mpitest.h" - #define ITERS 5 - - int main(int argc, char **argv) { int errs = 0; @@ -115,9 +112,7 @@ int main(int argc, char **argv) errs += MTestTestComm(new_comm[i]); MPI_Comm_free(&new_comm[i]); } - MTestFreeComm(&test_comm); - } /* Now the test for inter-communicators */ while (MTestGetIntercomm(&test_comm, &isleft, 1)) { @@ -129,8 +124,6 @@ int main(int argc, char **argv) MPI_Comm_remote_size(test_comm, &rsize); /* Ibarrier */ - - for (i = 0; i < ITERS; i++) { MPI_Ibarrier(test_comm, &sreq[i]); MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i + ITERS]); @@ -140,7 +133,6 @@ int main(int argc, char **argv) errs += MTestTestComm(new_comm[i]); MPI_Comm_free(&new_comm[i]); } - /*Ibcast */ for (i = 0; i < ITERS; i++) { if (isleft) { @@ -184,13 +176,9 @@ int main(int argc, char **argv) errs += MTestTestComm(new_comm[i]); MPI_Comm_free(&new_comm[i]); } - MTestFreeComm(&test_comm); - } MTest_Finalize(errs); MPI_Finalize(); return 0; - - } diff --git a/test/mpi/threads/comm/comm_idup.c b/test/mpi/threads/comm/comm_idup.c index d8fa220..45cb4c7 100644 --- a/test/mpi/threads/comm/comm_idup.c +++ b/test/mpi/threads/comm/comm_idup.c @@ -58,13 +58,11 @@ MTEST_THREAD_RETURN_TYPE test_comm_dup(void *arg) if (verbose) printf("\t%d: Thread %d - comm_idup %d finish\n", rank, *(int *) arg, i); } - if (verbose) printf("%d: Thread %d - Done.\n", rank, *(int *) arg); return (MTEST_THREAD_RETURN_TYPE) 0; } - int main(int argc, char **argv) { int thread_args[NUM_THREADS]; @@ -87,7 +85,6 @@ int main(int argc, char **argv) thread_args[i] = i; MTest_Start_thread(test_comm_dup, (void *) &thread_args[i]); } - MTest_Join_threads(); for (i = 0; i < NUM_THREADS; i++) { @@ -98,6 +95,5 @@ int main(int argc, char **argv) printf(" No Errors\n"); MPI_Finalize(); - return 0; } diff --git a/test/mpi/threads/comm/idup_comm_gen.c b/test/mpi/threads/comm/idup_comm_gen.c index f926ff9..0f517c2 100644 --- a/test/mpi/threads/comm/idup_comm_gen.c +++ b/test/mpi/threads/comm/idup_comm_gen.c @@ -49,7 +49,6 @@ MTEST_THREAD_RETURN_TYPE test_idup(void *arg) } /* Overlap pending idups with various comm generation functions */ - /* Comm_dup */ MPI_Comm_dup(incomm, &outcomm); errs[tid] += MTestTestComm(outcomm); @@ -86,13 +85,11 @@ MTEST_THREAD_RETURN_TYPE test_idup(void *arg) outcomm = MPI_COMM_NULL; } MPI_Group_free(&even_group); - errs[tid] += MTestTestComm(outcomm); MTestFreeComm(&outcomm); /* Intercomm_create & Intercomm_merge */ MPI_Comm_split(incomm, (rank < size / 2), rank, &local_comm); - if (rank == 0) { rleader = size / 2; } @@ -110,7 +107,6 @@ MTEST_THREAD_RETURN_TYPE test_idup(void *arg) errs[tid] += MTestTestComm(inter_comm); MTestFreeComm(&inter_comm); - errs[tid] += MTestTestComm(outcomm); MTestFreeComm(&outcomm); @@ -119,13 +115,10 @@ MTEST_THREAD_RETURN_TYPE test_idup(void *arg) errs[tid] += MTestTestComm(idupcomms[i]); MPI_Comm_free(&idupcomms[i]); } - MPI_Group_free(&ingroup); - return NULL; } - int main(int argc, char **argv) { int thread_args[NUM_THREADS]; @@ -140,7 +133,6 @@ int main(int argc, char **argv) printf("MPI_THREAD_MULTIPLE for the test\n"); MPI_Abort(MPI_COMM_WORLD, 1); } - if (size < 2) { printf("This test requires at least two processes\n"); MPI_Abort(MPI_COMM_WORLD, 1); @@ -149,19 +141,16 @@ int main(int argc, char **argv) for (i = 0; i < NUM_THREADS; i++) { MPI_Comm_dup(MPI_COMM_WORLD, &comms[i]); } - for (i = 0; i < NUM_THREADS; i++) { thread_args[i] = i; MTest_Start_thread(test_idup, (void *) &thread_args[i]); } - MTest_Join_threads(); for (i = 0; i < NUM_THREADS; i++) { MPI_Comm_free(&comms[i]); toterrs += errs[i]; } - MTest_Finalize(toterrs); MPI_Finalize(); return 0; diff --git a/test/mpi/threads/comm/idup_nb.c b/test/mpi/threads/comm/idup_nb.c index 88b7df4..28a7d3e 100644 --- a/test/mpi/threads/comm/idup_nb.c +++ b/test/mpi/threads/comm/idup_nb.c @@ -73,7 +73,6 @@ MTEST_THREAD_RETURN_TYPE test_intracomm(void *arg) MPI_Comm_rank(parentcomm, &rank); MPI_Iscan(&rank, &ans[0], 1, MPI_INT, MPI_SUM, parentcomm, &reqs[cnt++]); expected[0] = rank * (rank + 1) / 2; - /* Wait for the first child comm to be ready */ MPI_Wait(&reqs[0], MPI_STATUS_IGNORE); @@ -101,7 +100,6 @@ MTEST_THREAD_RETURN_TYPE test_intracomm(void *arg) /* Pending operations include idup/iscan/ibcast on parentcomm * idup/Iallreduce/Ibarrier on comms[0], and Iscan on nbrcomm */ - /* Waitall even if the first request is completed */ MPI_Waitall(cnt, reqs, MPI_STATUSES_IGNORE); @@ -110,16 +108,13 @@ MTEST_THREAD_RETURN_TYPE test_intracomm(void *arg) if (ans[j] != expected[j]) errs[tid]++; } - for (j = 0; j < NUM_IDUPS1 + NUM_IDUPS2; j++) { errs[tid] += MTestTestComm(comms[j]); MPI_Comm_free(&comms[j]); } - if (verbose) printf("\t%d: Thread %d - comm_idup %d finish\n", rank, tid, i); } - if (verbose) printf("%d: Thread %d - Done.\n", rank, tid); return (MTEST_THREAD_RETURN_TYPE) 0; @@ -159,7 +154,6 @@ MTEST_THREAD_RETURN_TYPE test_intercomm(void *arg) MPI_Comm_remote_size(parentcomm, &rsize); MPI_Iallreduce(&rank, &ans[0], 1, MPI_INT, MPI_SUM, parentcomm, &reqs[cnt++]); expected[0] = (rsize - 1) * rsize / 2; - /* Wait for the first child comm to be ready */ MPI_Wait(&reqs[0], MPI_STATUS_IGNORE); @@ -190,7 +184,6 @@ MTEST_THREAD_RETURN_TYPE test_intercomm(void *arg) } MPI_Ibcast(&ans[2], 1, MPI_INT, root, parentcomm, &reqs[cnt++]); expected[2] = 199; - MPI_Ibarrier(comms[0], &reqs[cnt++]); /* Do an Iscan on a neighbor comm */ @@ -201,7 +194,6 @@ MTEST_THREAD_RETURN_TYPE test_intercomm(void *arg) /* Pending operations include idup/iallreduce/ibcast on parentcomm * Iallreduce/Ibarrier on comms[0], and Iallreduce on nbrcomm */ - /* Waitall even if the first request is completed */ MPI_Waitall(cnt, reqs, MPI_STATUSES_IGNORE); @@ -210,16 +202,13 @@ MTEST_THREAD_RETURN_TYPE test_intercomm(void *arg) if (ans[j] != expected[j]) errs[tid]++; } - for (j = 0; j < NUM_IDUPS1 + NUM_IDUPS2; j++) { errs[tid] += MTestTestComm(comms[j]); MPI_Comm_free(&comms[j]); } - if (verbose) printf("\t%d: Thread %d - comm_idup %d finish\n", rank, tid, i); } - if (verbose) printf("%d: Thread %d - Done.\n", rank, tid); return (MTEST_THREAD_RETURN_TYPE) 0; @@ -250,14 +239,12 @@ int main(int argc, char **argv) MPI_Comm_idup(newcomm, &parentcomms[i], &requests[2 * i]); MPI_Comm_idup(newcomm, &nbrcomms[i], &requests[2 * i + 1]); } - MPI_Waitall(NUM_THREADS * 2, requests, MPI_STATUSES_IGNORE); for (i = 0; i < NUM_THREADS; i++) { thread_args[i] = i; MTest_Start_thread(test_intracomm, (void *) &thread_args[i]); } - MTest_Join_threads(); for (i = 0; i < NUM_THREADS; i++) { @@ -265,7 +252,6 @@ int main(int argc, char **argv) MPI_Comm_free(&parentcomms[i]); MPI_Comm_free(&nbrcomms[i]); } - MTestFreeComm(&newcomm); } @@ -280,14 +266,12 @@ int main(int argc, char **argv) MPI_Comm_idup(newcomm, &parentcomms[i], &requests[2 * i]); MPI_Comm_idup(newcomm, &nbrcomms[i], &requests[2 * i + 1]); } - MPI_Waitall(NUM_THREADS * 2, requests, MPI_STATUSES_IGNORE); for (i = 0; i < NUM_THREADS; i++) { thread_args[i] = i; MTest_Start_thread(test_intercomm, (void *) &thread_args[i]); } - MTest_Join_threads(); for (i = 0; i < NUM_THREADS; i++) { @@ -295,10 +279,8 @@ int main(int argc, char **argv) MPI_Comm_free(&parentcomms[i]); MPI_Comm_free(&nbrcomms[i]); } - MTestFreeComm(&newcomm); } - MTest_Finalize(toterrs); MPI_Finalize(); return 0; http://git.mpich.org/mpich.git/commitdiff/46ea748cff16d1aeb759fe92f9df097729... commit 46ea748cff16d1aeb759fe92f9df097729b9d835 Author: Yanfei Guo <[email protected]> Date: Thu Aug 13 11:38:25 2015 -0500 Add the missing return 0 for idup-tests; Some of the comm_idup tests were missing the return 0; statement. Signed-off-by: Lena Oden <[email protected]> diff --git a/test/mpi/comm/comm_idup_iallreduce.c b/test/mpi/comm/comm_idup_iallreduce.c index 670c23f..b42c64b 100644 --- a/test/mpi/comm/comm_idup_iallreduce.c +++ b/test/mpi/comm/comm_idup_iallreduce.c @@ -222,5 +222,5 @@ int main(int argc, char **argv) MTest_Finalize(errs); MPI_Finalize(); - + return 0; } diff --git a/test/mpi/comm/comm_idup_isend.c b/test/mpi/comm/comm_idup_isend.c index 1814dae..4fe81ab 100644 --- a/test/mpi/comm/comm_idup_isend.c +++ b/test/mpi/comm/comm_idup_isend.c @@ -102,5 +102,5 @@ int main(int argc, char **argv) MTest_Finalize(errs); MPI_Finalize(); - + return 0; } diff --git a/test/mpi/comm/comm_idup_nb.c b/test/mpi/comm/comm_idup_nb.c index b6241e7..b4de5b9 100644 --- a/test/mpi/comm/comm_idup_nb.c +++ b/test/mpi/comm/comm_idup_nb.c @@ -190,7 +190,7 @@ int main(int argc, char **argv) } MTest_Finalize(errs); MPI_Finalize(); - + return 0; } http://git.mpich.org/mpich.git/commitdiff/1ec0c2128d9e4dc1191062f6c4c672ce8e... commit 1ec0c2128d9e4dc1191062f6c4c672ce8e5d5aa4 Author: Yanfei Guo <[email protected]> Date: Thu Aug 13 11:30:47 2015 -0500 Remove the use of C99 syntax (declarations after statements) Some of the new comm_idup test use declarations after statements. This patch fixes this. Signed-off-by: Lena Oden <[email protected]> diff --git a/test/mpi/comm/comm_idup_nb.c b/test/mpi/comm/comm_idup_nb.c index 2f86571..b6241e7 100644 --- a/test/mpi/comm/comm_idup_nb.c +++ b/test/mpi/comm/comm_idup_nb.c @@ -23,6 +23,7 @@ int main(int argc, char **argv) int in[ITERS], out[ITERS], sol; int rank, size, rsize, rrank; MPI_Request sreq[ITERS * 2]; + int root; MTest_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &rank); @@ -141,7 +142,6 @@ int main(int argc, char **argv) } /*Ibcast */ - int root; for (i = 0; i < ITERS; i++) { if (isleft) { if (rank == 0) { diff --git a/test/mpi/threads/comm/comm_idup.c b/test/mpi/threads/comm/comm_idup.c index a1a64bb..d8fa220 100644 --- a/test/mpi/threads/comm/comm_idup.c +++ b/test/mpi/threads/comm/comm_idup.c @@ -30,11 +30,11 @@ MTEST_THREAD_RETURN_TYPE test_comm_dup(void *arg) int rank; int i; MPI_Request req; + MPI_Comm comm, self_dup; MPI_Comm_rank(comms[*(int *) arg], &rank); for (i = 0; i < NUM_ITER; i++) { - MPI_Comm comm, self_dup; if (*(int *) arg == rank) { MTestSleep(1); ----------------------------------------------------------------------- Summary of changes: test/mpi/comm/comm_idup.c | 2 -- test/mpi/comm/comm_idup_iallreduce.c | 12 ++---------- test/mpi/comm/comm_idup_isend.c | 6 +----- test/mpi/comm/comm_idup_nb.c | 16 ++-------------- test/mpi/threads/comm/comm_idup.c | 6 +----- test/mpi/threads/comm/idup_comm_gen.c | 11 ----------- test/mpi/threads/comm/idup_nb.c | 18 ------------------ 7 files changed, 6 insertions(+), 65 deletions(-) hooks/post-receive -- MPICH primary repository
participants (1)
-
noreply＠mpich.org