July 2015 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2b3-205-g7b38ef0
by noreply＠mpich.org 11 Jul '15

11 Jul '15

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 7b38ef031693eb89bd30f4e2e4658752ae73f9e6 (commit) from cc6f9b7d56e6d94605651dfc9e51736374991b59 (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/7b38ef031693eb89bd30f4e2e4658752a… commit 7b38ef031693eb89bd30f4e2e4658752ae73f9e6 Author: Pavan Balaji <balaji(a)anl.gov> Date: Sat Jul 11 13:04:53 2015 -0500 Added a script to detect git conflicts. With the project including a large number of reference objects, our current usage of 8 for the abbreviation length might not be always sufficient. Currently, with this length, we have no conflicts and a probability of collision at 1.96%. diff --git a/maint/git-conflicts.bash b/maint/git-conflicts.bash new file mode 100755 index 0000000..e61f0f9 --- /dev/null +++ b/maint/git-conflicts.bash @@ -0,0 +1,31 @@ +#! /bin/bash + +max_abbrev=12 + +total=`git rev-list --all | wc -l` + +echo "Conflicts:" +echo "Format: [abbrev length]: number of conflicts / total number of refs (percentage conflicts)" +for ((x = 1 ; x <= ${max_abbrev} ; x++)) ; do + conflicts=`git rev-list --all --abbrev=$x --abbrev-commit | sort | uniq -D -w$x | wc -l` + percent=`echo "scale=8 ; 100 * $conflicts / $total" | bc | awk '{ printf("%1.2f\n", $0); }'` + echo " [$x]: $conflicts / $total ($percent %)" + if test "$conflicts" = "0" ; then break ; fi +done + +## +## probability calculation is based on this random link, that I found +## online: +## http://blog.cuviper.com/2013/11/10/how-short-can-git-abbreviate/ +## +## I have not verified the accuracy of the calculation at that link, +## but if it is online, it must be true, of course. ;-) +## + +echo +echo "Probability of Collision:" +echo "Format: [abbrev length]: probability of collision" +for ((; x <= ${max_abbrev} ; x++)) ; do + percent=`echo "scale=8 ; 100 * ($total ^ 2) / (16 ^ $x)" | bc | awk '{ printf("%1.2f\n", $0); }'` + echo " [$x]: $percent %" +done ----------------------------------------------------------------------- Summary of changes: maint/git-conflicts.bash | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) create mode 100755 maint/git-conflicts.bash hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-204-gcc6f9b7
by noreply＠mpich.org 10 Jul '15

10 Jul '15

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 cc6f9b7d56e6d94605651dfc9e51736374991b59 (commit) from c32221f8677d7772f06d2334e335fe2c6e50455a (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/cc6f9b7d56e6d94605651dfc9e5173637… commit cc6f9b7d56e6d94605651dfc9e51736374991b59 Author: Lena Oden <loden(a)anl.gov> Date: Fri Jul 10 00:22:37 2015 -0500 New comm_idup test, overlap with isend/irecv diff --git a/test/mpi/comm/Makefile.am b/test/mpi/comm/Makefile.am index 2739a40..9617dee 100644 --- a/test/mpi/comm/Makefile.am +++ b/test/mpi/comm/Makefile.am @@ -37,6 +37,7 @@ noinst_PROGRAMS = \ comm_idup \ comm_idup_mul \ comm_idup_overlap \ + comm_idup_isend \ comm_idup_nb \ comm_idup_iallreduce \ comm_info diff --git a/test/mpi/comm/comm_idup_isend.c b/test/mpi/comm/comm_idup_isend.c new file mode 100644 index 0000000..43afd81 --- /dev/null +++ b/test/mpi/comm/comm_idup_isend.c @@ -0,0 +1,100 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "mpi.h" +#include "mpitest.h" + + +#define ITERS 4 + +int main(int argc, char **argv) +{ + int errs = 0; + int i,j; + int rank, size, rsize; + int in[ITERS], out[ITERS], sol[ITERS], cnt; + int isLeft; + MPI_Comm newcomm[ITERS], testcomm; + MPI_Request *sreq; + + MTest_Init( &argc, &argv ); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + if (size < 2) { + printf("this test requires at least 2 processes\n"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + + sreq = (MPI_Request*)malloc(sizeof(MPI_Request)*(size+1)*ITERS); + + while (MTestGetIntracommGeneral(&testcomm, 1, 1)) { + if (testcomm == MPI_COMM_NULL) continue; + + MPI_Comm_rank(testcomm, &rank); + MPI_Comm_size(testcomm, &size); + cnt = 0; + for(j = 0; j < ITERS; j++) { + if(rank == 0) { + out[j] = 815; + in[j] = 815; + sol[j] = 815; + for(i = 1; i<size; i++) + MPI_Isend(&out[j], 1, MPI_INT, i, 0, testcomm, &sreq[cnt++]); + MPI_Comm_idup(testcomm, &newcomm[j], &sreq[cnt++]); + } else { + out[j] = 0; + in[j] = 0; + sol[j] = 815; + 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); + + for(j = 0; j < ITERS; j++) { + if(sol[j] != in[j]) errs++; + errs+=MTestTestComm(newcomm[j]); + MPI_Comm_free(&newcomm[j]); + } + MTestFreeComm(&testcomm); + } + while (MTestGetIntercomm(&testcomm, &isLeft, 1)) { + if (testcomm == MPI_COMM_NULL) continue; + + MPI_Comm_rank(testcomm, &rank); + MPI_Comm_size(testcomm, &size); + MPI_Comm_remote_size(testcomm, &rsize); + cnt = 0; + for(j = 0; j < ITERS; j++) { + if(rank == 0) { + out[j] = 815; + in[j] = 815; + sol[j] = 815; + for(i = 1; i<rsize; i++) + MPI_Isend(&out[j], 1, MPI_INT, i, 0, testcomm, &sreq[cnt++]); + MPI_Comm_idup(testcomm, &newcomm[j], &sreq[cnt++]); + } else { + out[j] = 0; + in[j] = 0; + sol[j] = 815; + 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); + + for(j = 0; j < ITERS; j++) { + if(sol[j] != in[j]) errs++; + errs+=MTestTestComm(newcomm[j]); + MPI_Comm_free(&newcomm[j]); + } + MTestFreeComm(&testcomm); + } + + MTest_Finalize(errs); + MPI_Finalize(); + +} diff --git a/test/mpi/comm/testlist b/test/mpi/comm/testlist index 5132e5b..b75d295 100644 --- a/test/mpi/comm/testlist +++ b/test/mpi/comm/testlist @@ -31,6 +31,7 @@ comm_idup_mul 2 mpiversion=3.0 comm_idup_overlap 2 mpiversion=3.0 comm_idup_iallreduce 6 mpiversion=3.0 xfail=ticket2269 comm_idup_nb 6 mpiversion=3.0 xfail=ticket2283 +comm_idup_isend 6 mpiversion=3.0 xfail=ticket2269 dup_with_info 2 mpiversion=3.0 dup_with_info 4 mpiversion=3.0 dup_with_info 9 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/comm/Makefile.am | 1 + test/mpi/comm/comm_idup_isend.c | 100 +++++++++++++++++++++++++++++++++++++++ test/mpi/comm/testlist | 1 + 3 files changed, 102 insertions(+), 0 deletions(-) create mode 100644 test/mpi/comm/comm_idup_isend.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-203-gc32221f
by noreply＠mpich.org 10 Jul '15

10 Jul '15

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 c32221f8677d7772f06d2334e335fe2c6e50455a (commit) via c6a3ed2047649f0277799dc2d7a532c485017f5d (commit) from cf2e048d3a6faec799b1ec218f3875d0dbc93500 (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/c32221f8677d7772f06d2334e335fe2c6… commit c32221f8677d7772f06d2334e335fe2c6e50455a Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Thu Jul 9 18:39:40 2015 -0500 Mmultithreaded test to overlap idups with comm gen-functions Signed-off-by: Lena Oden <loden(a)anl.gov> diff --git a/test/mpi/threads/comm/Makefile.am b/test/mpi/threads/comm/Makefile.am index 6a1da81..38831f2 100644 --- a/test/mpi/threads/comm/Makefile.am +++ b/test/mpi/threads/comm/Makefile.am @@ -9,5 +9,5 @@ include $(top_srcdir)/threads/Makefile_threads.mtest EXTRA_DIST = testlist -noinst_PROGRAMS = ctxdup dup_leak_test comm_dup_deadlock comm_create_threads comm_create_group_threads comm_idup ctxidup idup_nb +noinst_PROGRAMS = ctxdup dup_leak_test comm_dup_deadlock comm_create_threads comm_create_group_threads comm_idup ctxidup idup_nb idup_comm_gen diff --git a/test/mpi/threads/comm/idup_comm_gen.c b/test/mpi/threads/comm/idup_comm_gen.c new file mode 100644 index 0000000..ca09cc9 --- /dev/null +++ b/test/mpi/threads/comm/idup_comm_gen.c @@ -0,0 +1,159 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +/* This test tries to overlap multiple Comm_idups with other communicator + creation functions, either intracomm or intercomm. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <mpi.h> +#include "mpitest.h" +#include "mpithreadtest.h" + +#define NUM_THREADS 4 +#define NUM_IDUPS 5 + +MPI_Comm comms[NUM_THREADS]; +MPI_Comm errs[NUM_THREADS] = {0}; +int verbose = 0; + +MTEST_THREAD_RETURN_TYPE test_idup(void *arg) +{ + int i; + int size, rank; + int ranges[1][3]; + int rleader, isLeft; + int *excl = NULL; + int tid = *(int*)arg; + + MPI_Group ingroup, high_group, even_group; + MPI_Comm local_comm, inter_comm; + MPI_Comm idupcomms[NUM_IDUPS]; + MPI_Request reqs[NUM_IDUPS]; + + MPI_Comm outcomm; + MPI_Comm incomm = comms[tid]; + + MPI_Comm_size(incomm, &size); + MPI_Comm_rank(incomm, &rank); + MPI_Comm_group(incomm, &ingroup); + + /* Idup incomm multiple times */ + for (i = 0; i < NUM_IDUPS; i++) { + MPI_Comm_idup(incomm, &idupcomms[i], &reqs[i]); + } + + /* Overlap pending idups with various comm generation functions */ + + /* Comm_dup */ + MPI_Comm_dup(incomm, &outcomm); + errs[tid] += MTestTestComm(outcomm); + MTestFreeComm(&outcomm); + + /* Comm_split */ + MPI_Comm_split(incomm, rank%2, size-rank, &outcomm); + errs[tid] += MTestTestComm(outcomm); + MTestFreeComm(&outcomm); + + /* Comm_create, high half of incomm */ + ranges[0][0] = size/2; + ranges[0][1] = size-1; + ranges[0][2] = 1; + MPI_Group_range_incl(ingroup, 1, ranges, &high_group); + MPI_Comm_create(incomm, high_group, &outcomm); + MPI_Group_free(&high_group); + errs[tid] += MTestTestComm(outcomm); + MTestFreeComm(&outcomm); + + /* Comm_create_group, even ranks of incomm */ + /* exclude the odd ranks */ + excl = malloc((size/2) * sizeof(int)); + for (i = 0; i < size / 2; i++) excl[i] = (2 * i) + 1; + + MPI_Group_excl(ingroup, size / 2, excl, &even_group); + free(excl); + + if (rank % 2 == 0) { + MPI_Comm_create_group(incomm, even_group, 0, &outcomm); + } else { + 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; } + else if (rank == size/2) { rleader = 0; } + else { rleader = -1; } + isLeft = rank < size/2; + + MPI_Intercomm_create(local_comm, 0, incomm, rleader, 99, &inter_comm); + MPI_Intercomm_merge(inter_comm, isLeft, &outcomm); + MPI_Comm_free(&local_comm); + + errs[tid] += MTestTestComm(inter_comm); + MTestFreeComm(&inter_comm); + + errs[tid] += MTestTestComm(outcomm); + MTestFreeComm(&outcomm); + + MPI_Waitall(NUM_IDUPS, reqs, MPI_STATUSES_IGNORE); + for (i = 0; i < NUM_IDUPS; i++) { + 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]; + int i, provided; + int toterrs = 0; + int size; + + MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided); + MPI_Comm_size(MPI_COMM_WORLD, &size); + + if (provided < MPI_THREAD_MULTIPLE) { + 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); + } + + 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/testlist b/test/mpi/threads/comm/testlist index a8a9ec9..de5da72 100644 --- a/test/mpi/threads/comm/testlist +++ b/test/mpi/threads/comm/testlist @@ -6,3 +6,4 @@ comm_create_group_threads 4 comm_idup 4 mpiversion=3.0 xfail=ticket2269 ctxidup 4 mpiversion=3.0 idup_nb 4 mpiversion=3.0 xfail=ticket2283 +idup_comm_gen 4 mpiversion=3.0 xfail=ticket2269 http://git.mpich.org/mpich.git/commitdiff/c6a3ed2047649f0277799dc2d7a532c48… commit c6a3ed2047649f0277799dc2d7a532c485017f5d Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Thu Jul 9 18:38:07 2015 -0500 Do not do testing on null communicators diff --git a/test/mpi/util/mtest.c b/test/mpi/util/mtest.c index a028f9d..99e41ee 100644 --- a/test/mpi/util/mtest.c +++ b/test/mpi/util/mtest.c @@ -939,7 +939,11 @@ int MTestTestIntracomm(MPI_Comm comm) int MTestTestComm(MPI_Comm comm) { int is_inter; + + if (comm == MPI_COMM_NULL) return 0; + MPI_Comm_test_inter(comm, &is_inter); + if (is_inter) return MTestTestIntercomm(comm); else ----------------------------------------------------------------------- Summary of changes: test/mpi/threads/comm/Makefile.am | 2 +- test/mpi/threads/comm/idup_comm_gen.c | 159 +++++++++++++++++++++++++++++++++ test/mpi/threads/comm/testlist | 1 + test/mpi/util/mtest.c | 4 + 4 files changed, 165 insertions(+), 1 deletions(-) create mode 100644 test/mpi/threads/comm/idup_comm_gen.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-201-gcf2e048
by noreply＠mpich.org 09 Jul '15

09 Jul '15

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 cf2e048d3a6faec799b1ec218f3875d0dbc93500 (commit) from 09c578fda2bd525e20061bdb124bde3ae817547d (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/cf2e048d3a6faec799b1ec218f3875d0d… commit cf2e048d3a6faec799b1ec218f3875d0dbc93500 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Thu Jul 9 15:32:03 2015 -0500 Mark idup_nb.c as xfail diff --git a/test/mpi/threads/comm/testlist b/test/mpi/threads/comm/testlist index 50b841d..a8a9ec9 100644 --- a/test/mpi/threads/comm/testlist +++ b/test/mpi/threads/comm/testlist @@ -5,4 +5,4 @@ comm_create_threads 4 comm_create_group_threads 4 comm_idup 4 mpiversion=3.0 xfail=ticket2269 ctxidup 4 mpiversion=3.0 -idup_nb 4 mpiversion=3.0 +idup_nb 4 mpiversion=3.0 xfail=ticket2283 ----------------------------------------------------------------------- Summary of changes: test/mpi/threads/comm/testlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-200-g09c578f
by noreply＠mpich.org 09 Jul '15

09 Jul '15

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 09c578fda2bd525e20061bdb124bde3ae817547d (commit) via bc06d48e58d2a32184a82c8f9b3b23b4cda62889 (commit) via 85aad78390f2df706a8dfeafd1e67042ec24c780 (commit) from 029b27c1e0ab6b8709e724d153b5cca8c65fdc8a (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/09c578fda2bd525e20061bdb124bde3ae… commit 09c578fda2bd525e20061bdb124bde3ae817547d Author: Lena Oden <loden(a)anl.gov> Date: Thu Jul 9 14:59:31 2015 -0500 Mark new comm_idup tests as xfail diff --git a/test/mpi/comm/testlist b/test/mpi/comm/testlist index ada42fe..5132e5b 100644 --- a/test/mpi/comm/testlist +++ b/test/mpi/comm/testlist @@ -29,8 +29,8 @@ comm_idup 4 mpiversion=3.0 comm_idup 9 mpiversion=3.0 comm_idup_mul 2 mpiversion=3.0 comm_idup_overlap 2 mpiversion=3.0 -comm_idup_iallreduce 6 mpiversion=3.0 -comm_idup_nb 6 mpiversion=3.0 +comm_idup_iallreduce 6 mpiversion=3.0 xfail=ticket2269 +comm_idup_nb 6 mpiversion=3.0 xfail=ticket2283 dup_with_info 2 mpiversion=3.0 dup_with_info 4 mpiversion=3.0 dup_with_info 9 mpiversion=3.0 http://git.mpich.org/mpich.git/commitdiff/bc06d48e58d2a32184a82c8f9b3b23b4c… commit bc06d48e58d2a32184a82c8f9b3b23b4cda62889 Author: Lena Oden <loden(a)anl.gov> Date: Thu Jul 9 13:12:29 2015 -0500 Add new test to overlab comm_idup with nb-coll. This test test to overalb comm_idup with different nonblocking collectives. Test on intra and inter- communicators Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/comm/Makefile.am b/test/mpi/comm/Makefile.am index 5f1fe92..2739a40 100644 --- a/test/mpi/comm/Makefile.am +++ b/test/mpi/comm/Makefile.am @@ -37,5 +37,6 @@ noinst_PROGRAMS = \ comm_idup \ comm_idup_mul \ comm_idup_overlap \ + comm_idup_nb \ comm_idup_iallreduce \ comm_info diff --git a/test/mpi/comm/comm_idup_nb.c b/test/mpi/comm/comm_idup_nb.c new file mode 100644 index 0000000..fe8e354 --- /dev/null +++ b/test/mpi/comm/comm_idup_nb.c @@ -0,0 +1,182 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "mpi.h" +#include "mpitest.h" + + +#define ITERS 3 + + + +int main(int argc, char **argv) +{ + int errs = 0; + int i, isleft; + MPI_Comm test_comm, new_comm[ITERS]; + int in[ITERS], out[ITERS], sol; + int rank, size, rsize, rrank; + MPI_Request sreq[ITERS*2]; + + MTest_Init( &argc, &argv ); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + + if (size < 2) { + printf("this test requires at least 2 processes\n"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + while (MTestGetIntracommGeneral(&test_comm, 1, 1)) { + if (test_comm == MPI_COMM_NULL) continue; + MPI_Comm_size(test_comm, &size); + MPI_Comm_rank(test_comm, &rank); + + /* Ibarrier */ + for(i = 0; i< ITERS; i++) { + MPI_Ibarrier(test_comm, &sreq[i]); + MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i+ITERS]); + } + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + + for(i = 0; i< ITERS; i++) { + errs += MTestTestComm(new_comm[i]); + MPI_Comm_free(&new_comm[i]); + } + /*Ibcast */ + for(i = 0; i< ITERS; i++) { + if(rank == 0) + in[i] = 815; + else + in[i] = 10; + MPI_Ibcast(&in[i], 1, MPI_INT, 0,test_comm, &sreq[i]); + MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i+ITERS]); + } + sol = 815; + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + + for(i = 0; i< ITERS; i++) { + if(in[i]!= sol) errs++; + errs += MTestTestComm(new_comm[i]); + MPI_Comm_free(&new_comm[i]); + } + /* Iallreduce */ + for(i = 0; i< ITERS; i++) { + in[i] = 1; + MPI_Iallreduce(&in[i], &out[i], 1, MPI_INT, MPI_SUM,test_comm, &sreq[i]); + MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i+ITERS]); + } + sol = size; + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + + for(i = 0; i< ITERS; i++) { + if(out[i]!= sol) errs++; + errs += MTestTestComm(new_comm[i]); + MPI_Comm_free(&new_comm[i]); + } + /* Isann */ + for(i = 0; i< ITERS; i++) { + MPI_Iscan(&rank, &out[i], 1, MPI_INT, MPI_SUM, test_comm, &sreq[i]); + MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i+ITERS]); + } + sol = rank*(rank+1)/2; + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + + for(i = 0; i< ITERS; i++) { + if(out[i]!= sol) errs++; + errs += MTestTestComm(new_comm[i]); + MPI_Comm_free(&new_comm[i]); + } + /*Ibcast */ + for(i = 0; i< ITERS; i++) { + if(rank == 0) + in[i] = 815; + else + in[i] = 10; + MPI_Ibcast(&in[i], 1, MPI_INT, 0,test_comm, &sreq[i]); + MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i+ITERS]); + } + sol = 815; + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + + + } +/* Now the test for inter-communicators */ + while (MTestGetIntercomm(&test_comm, &isleft, 1)) { + if (test_comm == MPI_COMM_NULL) continue; + + MPI_Comm_size(test_comm, &size); + MPI_Comm_rank(test_comm, &rank); + + 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]); + } + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + for(i = 0; i< ITERS; i++) { + if(in[i]!= sol) errs++; + errs += MTestTestComm(new_comm[i]); + MPI_Comm_free(&new_comm[i]); + } +*/ + /*Ibcast */ + int root; + for(i = 0; i< ITERS; i++) { + if (isleft) { + if (rank == 0) { + root = MPI_ROOT; + in[i] = 815; + } + else { + root = MPI_PROC_NULL; + in[i]= 815; /* not needed, just to make correctness checking easier */ + } + } + else { + root = 0; + in[i] = 213; /* garbage value */ + } + MPI_Ibcast(&in[i], 1, MPI_INT, root,test_comm, &sreq[i]); + MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i+ITERS]); + } + sol = 815; + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + + for(i = 0; i< ITERS; i++) { + if(in[i]!= sol) errs++; + errs += MTestTestComm(new_comm[i]); + MPI_Comm_free(&new_comm[i]); + } + /* Iallreduce */ + for(i = 0; i< ITERS; i++) { + in[i] = 1; + MPI_Iallreduce(&in[i], &out[i], 1, MPI_INT, MPI_SUM,test_comm, &sreq[i]); + MPI_Comm_idup(test_comm, &new_comm[i], &sreq[i+ITERS]); + } + sol = rsize; + MPI_Waitall(ITERS*2, sreq, MPI_STATUS_IGNORE); + + for(i = 0; i< ITERS; i++) { + if(out[i]!= sol) errs++; + errs += MTestTestComm(new_comm[i]); + MPI_Comm_free(&new_comm[i]); + } + + + } + MTest_Finalize( errs ); + MPI_Finalize(); + + + +} diff --git a/test/mpi/comm/testlist b/test/mpi/comm/testlist index aa7eaa2..ada42fe 100644 --- a/test/mpi/comm/testlist +++ b/test/mpi/comm/testlist @@ -30,6 +30,7 @@ comm_idup 9 mpiversion=3.0 comm_idup_mul 2 mpiversion=3.0 comm_idup_overlap 2 mpiversion=3.0 comm_idup_iallreduce 6 mpiversion=3.0 +comm_idup_nb 6 mpiversion=3.0 dup_with_info 2 mpiversion=3.0 dup_with_info 4 mpiversion=3.0 dup_with_info 9 mpiversion=3.0 http://git.mpich.org/mpich.git/commitdiff/85aad78390f2df706a8dfeafd1e67042e… commit 85aad78390f2df706a8dfeafd1e67042ec24c780 Author: Lena Oden <loden(a)anl.gov> Date: Wed Jul 1 15:03:29 2015 -0500 Add new comm_idup test: overlap with iallreduce This new test for comm_idup overlap comm_idup with iallreduce. The test uses different communicators and different overlap scenarios. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index b8e0b16..86babec 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -127,6 +127,7 @@ /comm/commname /comm/dupic /comm/ctxalloc +/comm/comm_idup_iallreduce /cxx/testlist /cxx/topo/testlist /cxx/coll/uallreduce diff --git a/test/mpi/comm/Makefile.am b/test/mpi/comm/Makefile.am index 5602828..5f1fe92 100644 --- a/test/mpi/comm/Makefile.am +++ b/test/mpi/comm/Makefile.am @@ -37,4 +37,5 @@ noinst_PROGRAMS = \ comm_idup \ comm_idup_mul \ comm_idup_overlap \ + comm_idup_iallreduce \ comm_info diff --git a/test/mpi/comm/comm_idup_iallreduce.c b/test/mpi/comm/comm_idup_iallreduce.c new file mode 100644 index 0000000..8aedd51 --- /dev/null +++ b/test/mpi/comm/comm_idup_iallreduce.c @@ -0,0 +1,220 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#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 + * 2.) Do the above test in a loop + * 3.) Dublicate COMM_WORLD, overalp iallreduce on one + * communicator with comm_idup on the nother communicator + * 4.) Split MPI_COMM_WORLD, communicate on the split communicator + while dublicating COMM_WORLD + * 5.) Duplicate the split communicators with comm_idup + * while communicating onCOMM_WORLD + * 6.) Ceate an inter-communicator and duplicate it with comm_idup while + * communicating on the inter-communicator + * 7.) Dublicate the inter-communicator whil communicate on COMM_WORLD + * 8.) Merge the inter-communicator to an intra-communicator and idup it, + * overlapping with communication on MPI_COMM_WORLD + * 9.) Communicate on the merge communicator, while duplicating COMM_WORLD +*/ + + + +int main(int argc, char **argv) +{ + int errs = 0; + int i; + int rank, size, lrank, lsize, rsize, isize; + int in, out, sol; + + MPI_Comm newcomm, newcomm_v[ITERS], dup_comm, split, ic, merge; + MPI_Request sreq[ITERS*2]; + + MTest_Init( &argc, &argv ); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + + if (size < 2) { + printf("this test requires at least 2 processes\n"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + /* set input buffer and compare buffer */ + in = 1; + sol = size; + MPI_Comm_idup(MPI_COMM_WORLD, &newcomm, &sreq[0]); + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &sreq[1]); + + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + /* Test results of overlapping allreduce */ + if(sol != out) + errs++; + /*Test new communicator */ + errs += MTestTestComm(newcomm); + MPI_Comm_free(&newcomm); + + for(i = 0; i < ITERS; i++){ + MPI_Comm_idup(MPI_COMM_WORLD, &newcomm_v[i], &sreq[i]); + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &sreq[i+ITERS]); + } + MPI_Waitall(ITERS*2,sreq, MPI_STATUS_IGNORE); + + for( i = 0; i<ITERS ; i++) { + errs += MTestTestComm(newcomm_v[i]); + 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]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + else { + MPI_Comm_idup(dup_comm, &newcomm, &sreq[1]); + 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++; + + /*Test new communicator */ + errs += MTestTestComm(newcomm); + + 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); + + sol = lsize; + if(lrank == 0) { + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, split, &sreq[0]); + MPI_Comm_idup(MPI_COMM_WORLD, &newcomm, &sreq[1]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + else { + MPI_Comm_idup(MPI_COMM_WORLD, &newcomm, &sreq[1]); + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, split, &sreq[0]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + /* Test Iallreduce */ + if(sol != out) errs++;; + + /* Test new communicator */ + errs += MTestTestComm(newcomm); + MPI_Comm_free(&newcomm); + sol = size; + + if(lrank == 0) { + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &sreq[0]); + MPI_Comm_idup(split, &newcomm, &sreq[1]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + else { + MPI_Comm_idup(split, &newcomm, &sreq[1]); + 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++;; + + /* Test new communicator */ + errs += MTestTestComm(newcomm); + MPI_Comm_free(&newcomm); + + MPI_Intercomm_create(split, 0, MPI_COMM_WORLD, (rank == 0 ? 1 : 0), 1234, &ic); + MPI_Comm_remote_size(ic, &rsize); + + sol = rsize; + + MPI_Comm_idup(ic, &newcomm, &sreq[1]); + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, ic, &sreq[0]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + + + if(sol != out) errs++;; + /* Test new inter communicator */ + errs += MTestTestComm(newcomm); + MPI_Comm_free(&newcomm); + + sol = lsize; + if(lrank == 0) { + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, split, &sreq[0]); + MPI_Comm_idup(ic, &newcomm, &sreq[1]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + else { + MPI_Comm_idup(ic, &newcomm, &sreq[1]); + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, split, &sreq[0]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + /* Test Iallreduce resutls for split-communicator*/ + if(sol != out) errs++;; + /* Test new inter-communicator */ + + errs += MTestTestComm(newcomm); + MPI_Comm_free(&newcomm); + + + MPI_Intercomm_merge( ic, rank%2, &merge ); + MPI_Comm_size(merge, &isize); + + sol = size; + if(rank == 0) { + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &sreq[0]); + MPI_Comm_idup(merge, &newcomm, &sreq[1]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + else { + MPI_Comm_idup(merge, &newcomm, &sreq[1]); + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &sreq[0]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + + + if(sol != out) errs++;; + /* Test new communicator */ + errs += MTestTestComm(newcomm); + MPI_Comm_free(&newcomm); + sol = isize; + + if(rank == 0) { + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, merge, &sreq[0]); + MPI_Comm_idup(MPI_COMM_WORLD, &newcomm, &sreq[1]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + else { + MPI_Comm_idup(MPI_COMM_WORLD, &newcomm, &sreq[1]); + MPI_Iallreduce(&in, &out, 1, MPI_INT, MPI_SUM, merge, &sreq[0]); + MPI_Waitall(2, sreq, MPI_STATUS_IGNORE); + } + + MPI_Comm_free(&merge); + MPI_Comm_free(&newcomm); + MPI_Comm_free(&split); + MPI_Comm_free(&ic); + + MTest_Finalize(errs); + MPI_Finalize(); + +} diff --git a/test/mpi/comm/testlist b/test/mpi/comm/testlist index b3987af..aa7eaa2 100644 --- a/test/mpi/comm/testlist +++ b/test/mpi/comm/testlist @@ -29,6 +29,7 @@ comm_idup 4 mpiversion=3.0 comm_idup 9 mpiversion=3.0 comm_idup_mul 2 mpiversion=3.0 comm_idup_overlap 2 mpiversion=3.0 +comm_idup_iallreduce 6 mpiversion=3.0 dup_with_info 2 mpiversion=3.0 dup_with_info 4 mpiversion=3.0 dup_with_info 9 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/.gitignore | 1 + test/mpi/comm/Makefile.am | 2 + test/mpi/comm/comm_idup_iallreduce.c | 220 ++++++++++++++++++++++++++++++++++ test/mpi/comm/comm_idup_nb.c | 182 ++++++++++++++++++++++++++++ test/mpi/comm/testlist | 2 + 5 files changed, 407 insertions(+), 0 deletions(-) create mode 100644 test/mpi/comm/comm_idup_iallreduce.c create mode 100644 test/mpi/comm/comm_idup_nb.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-197-g029b27c
by noreply＠mpich.org 09 Jul '15

09 Jul '15

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 029b27c1e0ab6b8709e724d153b5cca8c65fdc8a (commit) from a849468b5efbf1e0ea4bd82e1fad86c0d9326a43 (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/029b27c1e0ab6b8709e724d153b5cca8c… commit 029b27c1e0ab6b8709e724d153b5cca8c65fdc8a Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Jul 8 13:40:10 2015 -0500 Remove unused finishpending functions. MPIDI_CH3U_Comm_FinishPending and MPIDI_CH3U_VC_FinishPending functions are unused and incorrect. We use reference counting to make sure we can close connections. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index f579fc3..e05d569 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1122,10 +1122,6 @@ int MPIDI_CH3_Complete_Acceptq_dequeue(MPIDI_VC_t * vc); END MPI PORT SECTION --------------------------*/ -/* part of mpid_vc.c, this routine completes any pending operations - on a communicator */ -int MPIDI_CH3U_Comm_FinishPending( MPID_Comm * ); - #define MPIDI_MAX_KVS_VALUE_LEN 4096 /* ------------------------------------------------------------------------- */ diff --git a/src/mpid/ch3/src/mpid_comm_disconnect.c b/src/mpid/ch3/src/mpid_comm_disconnect.c index a115c6e..0f187de 100644 --- a/src/mpid/ch3/src/mpid_comm_disconnect.c +++ b/src/mpid/ch3/src/mpid_comm_disconnect.c @@ -34,23 +34,6 @@ int MPID_Comm_disconnect(MPID_Comm *comm_ptr) MPIU_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - /* Before releasing the communicator, we need to ensure that all VCs are - in a stable state. In particular, if a VC is still in the process of - connecting, complete the connection before tearing it down */ - /* FIXME: How can we get to a state where we are still connecting a VC but - the MPIR_Comm_release will find that the ref count decrements to zero - (it may be that some operation fails to increase/decrease the reference - count. A patch could be to increment the reference count while - connecting, then decrement it. But the increment in the reference - count should come - from the step that caused the connection steps to be initiated. - Possibility: if the send queue is not empty, the ref count should - be higher. */ - /* FIXME: This doesn't work yet */ - /* - mpi_errno = MPIDI_CH3U_Comm_FinishPending( comm_ptr ); - */ - /* it's more than a comm_release, but ok for now */ /* FIXME: Describe what more might be required */ /* MPIU_PG_Printall( stdout ); */ diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index b340534..2b45214 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -96,8 +96,6 @@ MPIDI_VCRT_t; */ -static int MPIDI_CH3U_VC_FinishPending( MPIDI_VCRT_t *vcrt ); - /*@ MPID_VCRT_Create - Create a table of VC references @@ -191,12 +189,6 @@ int MPID_VCRT_Release(MPID_VCRT vcrt, int isDisconnect ) if (!in_use) { int i, inuse; - /* FIXME: Need a better way to define how vc's are closed that - takes into account pending operations on vcs, including - close events received from other processes. */ - /* mpi_errno = MPIDI_CH3U_VC_FinishPending( vcrt ); */ - if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } - for (i = 0; i < vcrt->size; i++) { MPIDI_VC_t * const vc = vcrt->vcr_table[i]; @@ -647,100 +639,6 @@ int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr, goto fn_exit; } -#undef FUNCNAME -#define FUNCNAME MPIDI_CH3U_VC_FinishPending -#undef FCNAME -#define FCNAME MPIDI_QUOTE(FUNCNAME) -static int MPIDI_CH3U_VC_FinishPending( MPIDI_VCRT_t *vcrt ) -{ - int mpi_errno = MPI_SUCCESS; - MPIDI_VC_t **vc; - int i, size, nPending; - MPID_Progress_state progress_state; - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_VC_FINISHPENDING); - - MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_VC_FINISHPENDING); - - do { - /* Compute the number of pending ops. - A virtual connection has pending operations if the state - is not INACTIVE or if the sendq is not null */ - nPending = 0; - vc = vcrt->vcr_table; - size = vcrt->size; - /* printf( "Size = %d\n", size ); fflush(stdout); */ - for (i=0; i<size; i++) { - if (vc[i]->state != MPIDI_VC_STATE_INACTIVE) { - /* FIXME: Printf for debugging */ - printf ("state for vc[%d] is %d\n", - i, vc[i]->state ); fflush(stdout); - nPending++; - } - } - if (nPending > 0) { - /* FIXME: See note about printfs above. It is never valid - to use printfs, even for panic messages */ - MPIU_Internal_error_printf( "Panic! %d pending operations!\n", nPending ); - /* printf( "Panic! %d pending operations!\n", nPending ); */ - fflush(stdout); - MPIU_Assert( nPending == 0 ); - } - else { - break; - } - - MPID_Progress_start(&progress_state); - MPIU_DBG_MSG_D(CH3_DISCONNECT,VERBOSE, - "Waiting for %d close operations", - nPending); - mpi_errno = MPID_Progress_wait(&progress_state); - /* --BEGIN ERROR HANDLING-- */ - if (mpi_errno != MPI_SUCCESS) { - MPID_Progress_end(&progress_state); - MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER, - "**ch3|close_progress"); - } - /* --END ERROR HANDLING-- */ - MPID_Progress_end(&progress_state); - } while(nPending > 0); - - fn_exit: - MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_VC_FINISHPENDING); - return mpi_errno; - fn_fail: - goto fn_exit; -} - -/* - * MPIDI_CH3U_Comm_FinishPending - Complete any pending operations on the - * communicator. - * - * Notes: - * This should be used before freeing or disconnecting a communicator. - * - * For better scalability, we might want to form a list of VC's with - * pending operations. - */ -#undef FUNCNAME -#define FUNCNAME MPIDI_CH3U_Comm_FinishPending -#undef FCNAME -#define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPIDI_CH3U_Comm_FinishPending( MPID_Comm *comm_ptr ) -{ - int mpi_errno = MPI_SUCCESS; - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_COMM_FINISHPENDING); - - MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_COMM_FINISHPENDING); - - mpi_errno = MPIDI_CH3U_VC_FinishPending( comm_ptr->vcrt ); - if (!mpi_errno && comm_ptr->local_vcrt) { - mpi_errno = MPIDI_CH3U_VC_FinishPending( comm_ptr->local_vcrt ); - } - - MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_COMM_FINISHPENDING); - return mpi_errno; -} - /* ----------------------------------------------------------------------- */ /* Routines to initialize a VC */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidimpl.h | 4 - src/mpid/ch3/src/mpid_comm_disconnect.c | 17 ----- src/mpid/ch3/src/mpid_vc.c | 102 ------------------------------- 3 files changed, 0 insertions(+), 123 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-196-ga849468
by noreply＠mpich.org 09 Jul '15

09 Jul '15

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 a849468b5efbf1e0ea4bd82e1fad86c0d9326a43 (commit) from 6a5ec946e12304fe662b1ef8414557c2182b5b11 (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/a849468b5efbf1e0ea4bd82e1fad86c0d… commit a849468b5efbf1e0ea4bd82e1fad86c0d9326a43 Author: Halim Amer <aamer(a)anl.gov> Date: Wed Jul 8 18:47:52 2015 -0500 Advise against using sleeping routines to implement the yield functionality Details are given in the added comment. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/util/wrappers/mpiu_process_wrappers.h b/src/util/wrappers/mpiu_process_wrappers.h index 7675c1b..8ec43ee 100644 --- a/src/util/wrappers/mpiu_process_wrappers.h +++ b/src/util/wrappers/mpiu_process_wrappers.h @@ -9,6 +9,16 @@ #include "mpichconf.h" /* MPIU_PW_SCHED_YIELD() - Yield the processor to OS scheduler */ +/* On a typical Linux system (verified with kernels 3.2 and 3.5), + * usleep has a resolution of more than 1000 cycles. This makes + * it impractical if the desired sleeping period is shorter. On + * the other hand, sleep(0) returns immediately without going to + * the kernel. This means that there is no actual yielding, which + * is equivalent to doing nothing. Thus, usleep and sleep are not + * recommended as ways to yield the CPU, and sched_yield would be + * preferred if available. + * Note that nanosleep has the same shortcomings as usleep.*/ + #if defined(USE_SWITCHTOTHREAD_FOR_YIELD) #include <winsock2.h> #include <windows.h> ----------------------------------------------------------------------- Summary of changes: src/util/wrappers/mpiu_process_wrappers.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-195-g6a5ec94
by noreply＠mpich.org 09 Jul '15

09 Jul '15

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 6a5ec946e12304fe662b1ef8414557c2182b5b11 (commit) from c77631474f072e86c9fe761c1328c3d4cb8cc4a5 (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/6a5ec946e12304fe662b1ef8414557c21… commit 6a5ec946e12304fe662b1ef8414557c2182b5b11 Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Thu Jul 2 16:39:41 2015 -0500 Rewrote MTest collective wrapper routine. The MTest collective routine helps MPI coll tests generate blocking and non-blocking collective versions from single source code. Previous code used PMPI redirection to link coll calls to its nbc implementation. This patch rewrote it to avoid PMPI calls in test code. Coll test can use this routine following three steps. 1. Include mpicolltest.h. 2. Use MTest_Collective instead of MPI_Collective (i.e., MPI_Barrier -> MTest_Barrier). 3. Set -DUSE_MTEST_NBC for nbc version in Makefile (see test/mpi/coll/Makefile.am). Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/coll/Makefile.am b/test/mpi/coll/Makefile.am index 0c1c5e1..b668e6b 100644 --- a/test/mpi/coll/Makefile.am +++ b/test/mpi/coll/Makefile.am @@ -119,21 +119,15 @@ 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. +# Generate tests of the nonblocking collectives by reusing the blocking tests. nballtoall1_SOURCES = alltoall1.c -nballtoall1_LDADD = $(LDADD) ../util/nbc_pmpi_adapter.$(OBJEXT) +nballtoall1_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS) nbredscat_SOURCES = redscat.c -nbredscat_LDADD = $(LDADD) ../util/nbc_pmpi_adapter.$(OBJEXT) +nbredscat_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS) nbredscat3_SOURCES = redscat3.c -nbredscat3_LDADD = $(LDADD) ../util/nbc_pmpi_adapter.$(OBJEXT) +nbredscat3_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS) nbredscatinter_SOURCES = redscatinter.c -nbredscatinter_LDADD = $(LDADD) ../util/nbc_pmpi_adapter.$(OBJEXT) +nbredscatinter_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS) nbcoll2_SOURCES = coll2.c -nbcoll2_LDADD = $(LDADD) ../util/nbc_pmpi_adapter.$(OBJEXT) +nbcoll2_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS) -# This is here instead of Makefile.mtest because it is only used in this -# set of tests -$(top_builddir)/util/nbc_pmpi_adapter.$(OBJEXT): $(top_srcdir)/util/nbc_pmpi_adapter.c - (cd $(top_builddir)/util && $(MAKE) nbc_pmpi_adapter.$(OBJEXT)) diff --git a/test/mpi/coll/alltoall1.c b/test/mpi/coll/alltoall1.c index cd6d3d8..c17f926 100644 --- a/test/mpi/coll/alltoall1.c +++ b/test/mpi/coll/alltoall1.c @@ -8,6 +8,7 @@ #include <stdio.h> #include "mpitest.h" #include <stdlib.h> +#include "mpicolltest.h" /* static char MTEST_Descrip[] = ""; @@ -63,7 +64,7 @@ int main( int argc, char *argv[] ) } } - MPI_Alltoall( sendbuf, sendcount, sendtype, + MTest_Alltoall( sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm ); p = recvbuf; diff --git a/test/mpi/coll/coll2.c b/test/mpi/coll/coll2.c index ae08c96..e89828b 100644 --- a/test/mpi/coll/coll2.c +++ b/test/mpi/coll/coll2.c @@ -6,6 +6,7 @@ #include "mpi.h" #include <stdio.h> #include "mpitest.h" +#include "mpicolltest.h" #define MAX_PROCESSES 10 @@ -47,7 +48,7 @@ int main( int argc, char **argv ) /* inefficient allgather */ for (i=0; i<participants; i++) { void *sendbuf = (i == rank ? MPI_IN_PLACE : &table[begin_row][0]); - MPI_Gather(sendbuf, send_count, MPI_INT, + MTest_Gather(sendbuf, send_count, MPI_INT, &table[0][0], recv_count, MPI_INT, i, MPI_COMM_WORLD ); } diff --git a/test/mpi/coll/redscat.c b/test/mpi/coll/redscat.c index 9214c5d..46d59ba 100644 --- a/test/mpi/coll/redscat.c +++ b/test/mpi/coll/redscat.c @@ -15,6 +15,7 @@ #include "mpi.h" #include <stdio.h> #include <stdlib.h> +#include "mpicolltest.h" int main( int argc, char **argv ) { @@ -36,7 +37,7 @@ int main( int argc, char **argv ) for (i=0; i<size; i++) recvcounts[i] = 1; - MPI_Reduce_scatter( sendbuf, &recvbuf, recvcounts, MPI_INT, MPI_SUM, comm ); + MTest_Reduce_scatter( sendbuf, &recvbuf, recvcounts, MPI_INT, MPI_SUM, comm ); sumval = size * rank + ((size - 1) * size)/2; /* recvbuf should be size * (rank + i) */ diff --git a/test/mpi/coll/redscat3.c b/test/mpi/coll/redscat3.c index e6057cd..b76774d 100644 --- a/test/mpi/coll/redscat3.c +++ b/test/mpi/coll/redscat3.c @@ -17,6 +17,7 @@ #include <stdio.h> #include <stdlib.h> #include "mpitest.h" +#include "mpicolltest.h" /* Limit the number of error reports */ #define MAX_ERRORS 10 @@ -65,7 +66,7 @@ int main( int argc, char **argv ) recvbuf[i] = -1; } - MPI_Reduce_scatter( sendbuf, recvbuf, recvcounts, MPI_INT, MPI_SUM, comm ); + MTest_Reduce_scatter( sendbuf, recvbuf, recvcounts, MPI_INT, MPI_SUM, comm ); sumval = size * rank + ((size - 1) * size)/2; /* recvbuf should be size * (rank + i) */ @@ -81,7 +82,7 @@ int main( int argc, char **argv ) } #if MTEST_HAVE_MIN_MPI_VERSION(2,2) - MPI_Reduce_scatter( MPI_IN_PLACE, sendbuf, recvcounts, MPI_INT, MPI_SUM, + MTest_Reduce_scatter( MPI_IN_PLACE, sendbuf, recvcounts, MPI_INT, MPI_SUM, comm ); sumval = size * rank + ((size - 1) * size)/2; diff --git a/test/mpi/coll/redscatinter.c b/test/mpi/coll/redscatinter.c index bebfd8a..38d7e8c 100644 --- a/test/mpi/coll/redscatinter.c +++ b/test/mpi/coll/redscatinter.c @@ -17,6 +17,7 @@ #include <stdio.h> #include <stdlib.h> #include "mpitest.h" +#include "mpicolltest.h" int main( int argc, char **argv ) { @@ -83,7 +84,7 @@ int main( int argc, char **argv ) recvbuf[i] = (long long)(-i); } - MPI_Reduce_scatter( sendbuf, recvbuf, recvcounts, MPI_LONG_LONG, MPI_SUM, + MTest_Reduce_scatter( sendbuf, recvbuf, recvcounts, MPI_LONG_LONG, MPI_SUM, comm ); /* Check received data */ diff --git a/test/mpi/include/mpicolltest.h b/test/mpi/include/mpicolltest.h new file mode 100644 index 0000000..4e24ab7 --- /dev/null +++ b/test/mpi/include/mpicolltest.h @@ -0,0 +1,377 @@ +/* -*- Mode: C; c-basic-offset:4 ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#ifndef MPICOLLTEST_H_INCLUDED +#define MPICOLLTEST_H_INCLUDED + +/* This file defines MTest wrapper functions for MPI collectives. + * Test uses MTest_Collective calls that are defined as blocking collective by + * default, or as non-blocking version by compiling with -DUSE_MTEST_NBC. */ + +#include "mpi.h" +#include "mpitestconf.h" + +/* Wrap up MTest_Collective calls by non-blocking collectives. + * It requires MPI_VERSION >= 3. */ +#if defined(USE_MTEST_NBC) && MPI_VERSION >= 3 +static inline int MTest_Barrier(MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ibarrier(comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, + MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ibcast(buffer, count, datatype, root, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, + MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, + root, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, + recvtype, root, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, + MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ialltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Alltoallw(const void *sendbuf, const int *sendcounts, const int *sdispls, + const MPI_Datatype * sendtypes, void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype * recvtypes, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, + recvcounts, rdispls, recvtypes, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, int root, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Iallreduce(sendbuf, recvbuf, count, datatype, op, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Iscan(sendbuf, recvbuf, count, datatype, op, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} + +static inline int MTest_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm) +{ + int mpi_errno; + MPI_Request req = MPI_REQUEST_NULL; + + mpi_errno = MPI_Iexscan(sendbuf, recvbuf, count, datatype, op, comm, &req); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + mpi_errno = MPI_Wait(&req, MPI_STATUS_IGNORE); + return mpi_errno; +} +#else +/* If USE_MTEST_NBC is not specified, or MPI_VERSION is less than 3, + * wrap up MTest_Collective calls by traditional blocking collectives.*/ + +static inline int MTest_Barrier(MPI_Comm comm) +{ + return MPI_Barrier(comm); +} + +static inline int MTest_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, + MPI_Comm comm) +{ + return MPI_Bcast(buffer, count, datatype, root, comm); +} + +static inline int MTest_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, + MPI_Comm comm) +{ + return MPI_Gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); +} + +static inline int MTest_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPI_Comm comm) +{ + return MPI_Gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, + recvtype, root, comm); +} + +static inline int MTest_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, + MPI_Comm comm) +{ + return MPI_Scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); +} + +static inline int MTest_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, MPI_Comm comm) +{ + return MPI_Scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm); +} + +static inline int MTest_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPI_Comm comm) +{ + return MPI_Allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); +} + +static inline int MTest_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPI_Comm comm) +{ + return MPI_Allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, comm); +} + +static inline int MTest_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) +{ + return MPI_Alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); +} + +static inline int MTest_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, MPI_Comm comm) +{ + return MPI_Alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm); +} + +static inline int MTest_Alltoallw(const void *sendbuf, const int *sendcounts, const int *sdispls, + const MPI_Datatype * sendtypes, void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype * recvtypes, MPI_Comm comm) +{ + return MPI_Alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, + recvcounts, rdispls, recvtypes, comm); +} + +static inline int MTest_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, int root, MPI_Comm comm) +{ + return MPI_Reduce(sendbuf, recvbuf, count, datatype, op, root, comm); +} + +static inline int MTest_Allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return MPI_Allreduce(sendbuf, recvbuf, count, datatype, op, comm); +} + +static inline int MTest_Reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return MPI_Reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm); +} + +static inline int MTest_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return MPI_Reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm); +} + +static inline int MTest_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm) +{ + return MPI_Scan(sendbuf, recvbuf, count, datatype, op, comm); +} + +static inline int MTest_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm) +{ + return MPI_Exscan(sendbuf, recvbuf, count, datatype, op, comm); +} + +#endif /* USE_MTEST_NBC */ +#endif /* MPICOLLTEST_H_INCLUDED */ diff --git a/test/mpi/util/Makefile.am b/test/mpi/util/Makefile.am index a31cc70..3a60e0b 100644 --- a/test/mpi/util/Makefile.am +++ b/test/mpi/util/Makefile.am @@ -4,16 +4,13 @@ AM_CPPFLAGS = -I${srcdir}/../include -I../include mtest.$(OBJEXT): mtest.c mtest_datatype.$(OBJEXT): mtest_datatype.c mtest_datatype.h dtypes.$(OBJEXT): dtypes.c -nbc_pmpi_adapter.$(OBJEXT): nbc_pmpi_adapter.c -all-local: mtest.$(OBJEXT) dtypes.$(OBJEXT) nbc_pmpi_adapter.$(OBJEXT) +all-local: mtest.$(OBJEXT) dtypes.$(OBJEXT) EXTRA_PROGRAMS = mtestcheck dtypes mtestcheck_SOURCES = mtestcheck.c mtest.c -# exploiting the NBC PMPI adapter is still very much a manual process... -# mtest_datatype.c and mtest_datatype_gen.c also needed # FIXME: mtest_datatype.h belongs with the other include files, in # ../include -EXTRA_DIST = nbc_pmpi_adapter.c mtest_datatype.c mtest_datatype.h \ +EXTRA_DIST = mtest_datatype.c mtest_datatype.h \ mtest_datatype_gen.c diff --git a/test/mpi/util/nbc_pmpi_adapter.c b/test/mpi/util/nbc_pmpi_adapter.c deleted file mode 100644 index 17e6b77..0000000 --- a/test/mpi/util/nbc_pmpi_adapter.c +++ /dev/null @@ -1,211 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * (C) 2011 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ - -/* A PMPI-based "adapter" that intercepts the traditional blocking collective - * operations and implements them via PMPI_Icollective/PMPI_Wait. This permits - * the use of a wide variety of MPI collective test suites and benchmarking - * programs with the newer nonblocking collectives. - * - * Author: Dave Goodell <goodell(a)mcs.anl.gov> - */ - -#include "mpi.h" -#include "mpitest.h" - -/* The test on the MPI_VERISON is needed to check for pre MPI-3 versions - of MPICH, which will not include const in declarations or - the non-blocking collectives. - */ -#if !defined(USE_STRICT_MPI) && defined(MPICH) && MPI_VERSION >= 3 - -int MPI_Barrier(MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ibarrier(comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ibcast(buffer, count, datatype, root, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ialltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Alltoallw(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Iallreduce(sendbuf, recvbuf, count, datatype, op, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Iscan(sendbuf, recvbuf, count, datatype, op, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) -{ - int mpi_errno; - MPI_Request req = MPI_REQUEST_NULL; - - mpi_errno = PMPI_Iexscan(sendbuf, recvbuf, count, datatype, op, comm, &req); - if (mpi_errno != MPI_SUCCESS) return mpi_errno; - mpi_errno = PMPI_Wait(&req, MPI_STATUS_IGNORE); - return mpi_errno; -} - -#endif ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/Makefile.am | 18 +-- test/mpi/coll/alltoall1.c | 3 +- test/mpi/coll/coll2.c | 3 +- test/mpi/coll/redscat.c | 3 +- test/mpi/coll/redscat3.c | 5 +- test/mpi/coll/redscatinter.c | 3 +- test/mpi/include/mpicolltest.h | 377 ++++++++++++++++++++++++++++++++++++++ test/mpi/util/Makefile.am | 7 +- test/mpi/util/nbc_pmpi_adapter.c | 211 --------------------- 9 files changed, 396 insertions(+), 234 deletions(-) create mode 100644 test/mpi/include/mpicolltest.h delete mode 100644 test/mpi/util/nbc_pmpi_adapter.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-194-gc776314
by noreply＠mpich.org 09 Jul '15

09 Jul '15

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 c77631474f072e86c9fe761c1328c3d4cb8cc4a5 (commit) from 13e979b211c4d626206628f157023d9a0b0d870d (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/c77631474f072e86c9fe761c1328c3d4c… commit c77631474f072e86c9fe761c1328c3d4cb8cc4a5 Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Jul 9 02:08:18 2015 -0500 Revert "Remove redundant definitions." This reverts commit 13e979b211c4d626206628f157023d9a0b0d870d. diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index dc76212..f579fc3 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -837,6 +837,12 @@ typedef enum MPIDI_VC_Event } MPIDI_VC_Event_t; +#ifndef HAVE_MPIDI_VCRT +#define HAVE_MPIDI_VCRT +typedef struct MPIDI_VCRT * MPID_VCRT; +typedef struct MPIDI_VC * MPID_VCR; +#endif + /* number of VCs that are in MORIBUND state */ extern int MPIDI_Failed_vc_count; diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index bea093e..6dd0481 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -182,8 +182,11 @@ MPIDI_CH3I_comm_t; #define MPID_DEV_COMM_DECL MPIDI_CH3I_comm_t dev; +#ifndef HAVE_MPIDI_VCRT +#define HAVE_MPIDI_VCRT typedef struct MPIDI_VCRT * MPID_VCRT; typedef struct MPIDI_VC * MPID_VCR; +#endif #ifndef DEFINED_REQ #define DEFINED_REQ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidimpl.h | 6 ++++++ src/mpid/ch3/include/mpidpre.h | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2b3-193-g13e979b
by noreply＠mpich.org 09 Jul '15

09 Jul '15

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 13e979b211c4d626206628f157023d9a0b0d870d (commit) from 24647c3b0b4fccb60962d61d154eb289fa776d31 (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/13e979b211c4d626206628f157023d9a0… commit 13e979b211c4d626206628f157023d9a0b0d870d Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Jul 8 14:10:01 2015 -0500 Remove redundant definitions. No reviewer. diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index f579fc3..dc76212 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -837,12 +837,6 @@ typedef enum MPIDI_VC_Event } MPIDI_VC_Event_t; -#ifndef HAVE_MPIDI_VCRT -#define HAVE_MPIDI_VCRT -typedef struct MPIDI_VCRT * MPID_VCRT; -typedef struct MPIDI_VC * MPID_VCR; -#endif - /* number of VCs that are in MORIBUND state */ extern int MPIDI_Failed_vc_count; diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 6dd0481..bea093e 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -182,11 +182,8 @@ MPIDI_CH3I_comm_t; #define MPID_DEV_COMM_DECL MPIDI_CH3I_comm_t dev; -#ifndef HAVE_MPIDI_VCRT -#define HAVE_MPIDI_VCRT typedef struct MPIDI_VCRT * MPID_VCRT; typedef struct MPIDI_VC * MPID_VCR; -#endif #ifndef DEFINED_REQ #define DEFINED_REQ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidimpl.h | 6 ------ src/mpid/ch3/include/mpidpre.h | 3 --- 2 files changed, 0 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0