[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b4-193-geec68f7
Service Account
noreply at mpich.org
Wed Aug 26 10:09:39 CDT 2015
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 eec68f7b6d2e26743b09b2a541aab68ebad5e062 (commit)
from 3202ec431db5a2c0d33272e1990e4fa19a3c1f6e (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/eec68f7b6d2e26743b09b2a541aab68ebad5e062
commit eec68f7b6d2e26743b09b2a541aab68ebad5e062
Author: Lena Oden <loden at anl.gov>
Date: Mon Aug 17 13:59:52 2015 -0500
Add nonblocking collective error tests
This patch modifies selected collective error checking tests
to test both blocking and nonblocking implementations.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/test/mpi/errors/coll/Makefile.am b/test/mpi/errors/coll/Makefile.am
index 6f81619..eb505eb 100644
--- a/test/mpi/errors/coll/Makefile.am
+++ b/test/mpi/errors/coll/Makefile.am
@@ -12,5 +12,14 @@ EXTRA_DIST = testlist
## for all programs that are just built from the single corresponding source
## file, we don't need per-target _SOURCES rules, automake will infer them
## correctly
-noinst_PROGRAMS = noalias noalias2 noalias3 rerr bcastlength reduce_local
+noinst_PROGRAMS = noalias noalias2 noalias3 rerr bcastlength reduce_local nb_noalias nb_rerr ibcastlength
+
+ibcastlength_SOURCES = bcastlength.c
+ibcastlength_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS)
+
+nb_noalias_SOURCES = noalias.c
+nb_noalias_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS)
+
+nb_rerr_SOURCES = rerr.c
+nb_rerr_CPPFLAGS = -DUSE_MTEST_NBC $(AM_CPPFLAGS)
diff --git a/test/mpi/errors/coll/bcastlength.c b/test/mpi/errors/coll/bcastlength.c
index 98a7821..38343d3 100644
--- a/test/mpi/errors/coll/bcastlength.c
+++ b/test/mpi/errors/coll/bcastlength.c
@@ -6,6 +6,7 @@
#include <stdio.h>
#include "mpi.h"
#include "mpitest.h"
+#include "mpicolltest.h"
/* Very simple test that Bcast handled mismatched lengths (while not a
common user error, we've seen it several times, so good handling of
@@ -27,10 +28,10 @@ int main(int argc, char *argv[])
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
if (rank == 0) {
- ierr = MPI_Bcast(buf, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ ierr = MTest_Bcast(buf, 1, MPI_INT, 0, MPI_COMM_WORLD);
}
else {
- ierr = MPI_Bcast(buf, 10, MPI_INT, 0, MPI_COMM_WORLD);
+ ierr = MTest_Bcast(buf, 10, MPI_INT, 0, MPI_COMM_WORLD);
}
if (ierr == MPI_SUCCESS) {
if (rank != 0) {
@@ -49,10 +50,10 @@ int main(int argc, char *argv[])
}
if (rank == 0) {
- ierr = MPI_Bcast(buf, 10, MPI_INT, 0, MPI_COMM_WORLD);
+ ierr = MTest_Bcast(buf, 10, MPI_INT, 0, MPI_COMM_WORLD);
}
else {
- ierr = MPI_Bcast(buf, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ ierr = MTest_Bcast(buf, 1, MPI_INT, 0, MPI_COMM_WORLD);
}
if (ierr == MPI_SUCCESS) {
if (rank != 0) {
diff --git a/test/mpi/errors/coll/noalias.c b/test/mpi/errors/coll/noalias.c
index 747ce47..d12d602 100644
--- a/test/mpi/errors/coll/noalias.c
+++ b/test/mpi/errors/coll/noalias.c
@@ -7,6 +7,7 @@
#include <stdlib.h>
#include "mpi.h"
#include "mpitest.h"
+#include "mpicolltest.h"
int main(int argc, char *argv[])
{
@@ -29,7 +30,7 @@ int main(int argc, char *argv[])
recvbuf[i] = -1;
}
- err = MPI_Allreduce(buf, buf, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
+ err = MTest_Allreduce(buf, buf, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
if (!err) {
errs++;
if (rank == 0)
@@ -50,7 +51,7 @@ int main(int argc, char *argv[])
* do our best to carry on in this case by posting a second non-erroneous
* MPI_Reduce on any process that got back an error from the intentionally
* erroneous MPI_Reduce. */
- err = MPI_Reduce(buf, ((rank == 0) ? buf : NULL), 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
+ err = MTest_Reduce(buf, ((rank == 0) ? buf : NULL), 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
if (rank == 0) {
if (!err) {
errs++;
@@ -65,7 +66,7 @@ int main(int argc, char *argv[])
}
if (err) {
/* post a correct MPI_Reduce on any processes that got an error earlier */
- err = MPI_Reduce(buf, recvbuf, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
+ err = MTest_Reduce(buf, recvbuf, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
if (err) {
errs++;
printf("make-up reduce failed on rank %d\n", rank);
@@ -75,7 +76,7 @@ int main(int argc, char *argv[])
/* this case should _not_ trigger an error, thanks to Kenneth Inghram for
* reporting this bug in MPICH */
err =
- MPI_Reduce(((rank == 0) ? MPI_IN_PLACE : buf), buf, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
+ MTest_Reduce(((rank == 0) ? MPI_IN_PLACE : buf), buf, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
if (err) {
errs++;
printf
@@ -86,7 +87,7 @@ int main(int argc, char *argv[])
}
/* check for aliasing detection in MPI_Gather (tt#1006) */
- err = MPI_Gather(buf, 1, MPI_INT, buf, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ err = MTest_Gather(buf, 1, MPI_INT, buf, 1, MPI_INT, 0, MPI_COMM_WORLD);
if (rank == 0) {
if (!err) {
errs++;
@@ -100,7 +101,7 @@ int main(int argc, char *argv[])
}
if (err) {
/* post a correct MPI_Gather on any processes that got an error earlier */
- err = MPI_Gather(buf, 1, MPI_INT, recvbuf, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ err = MTest_Gather(buf, 1, MPI_INT, recvbuf, 1, MPI_INT, 0, MPI_COMM_WORLD);
if (err) {
errs++;
printf("make-up gather failed on rank %d\n", rank);
diff --git a/test/mpi/errors/coll/rerr.c b/test/mpi/errors/coll/rerr.c
index 1daa6bc..00fa1eb 100644
--- a/test/mpi/errors/coll/rerr.c
+++ b/test/mpi/errors/coll/rerr.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include "mpi.h"
#include "mpitest.h"
-
+#include "mpicolltest.h"
/* Very simple test that Allreduce detects invalid (datatype,operation)
pair */
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
- ierr = MPI_Reduce(&a, &b, 1, MPI_BYTE, MPI_MAX, 0, MPI_COMM_WORLD);
+ ierr = MTest_Reduce(&a, &b, 1, MPI_BYTE, MPI_MAX, 0, MPI_COMM_WORLD);
if (ierr == MPI_SUCCESS) {
errs++;
printf("Did not detect invalid type/op pair (byte,max) in Allreduce\n");
diff --git a/test/mpi/errors/coll/testlist b/test/mpi/errors/coll/testlist
index 7cb768a..f3964cc 100644
--- a/test/mpi/errors/coll/testlist
+++ b/test/mpi/errors/coll/testlist
@@ -1,6 +1,9 @@
noalias 2
+nb_noalias 2 mpiversion=3.0
noalias2 4 mpiversion=2.2
noalias3 4 mpiversion=3.0
rerr 2
+nb_rerr 2 mpiversion=3.0
reduce_local 1
bcastlength 4
+ibcastlength 4 mpiversion=3.0
-----------------------------------------------------------------------
Summary of changes:
test/mpi/errors/coll/Makefile.am | 11 ++++++++++-
test/mpi/errors/coll/bcastlength.c | 9 +++++----
test/mpi/errors/coll/noalias.c | 13 +++++++------
test/mpi/errors/coll/rerr.c | 4 ++--
test/mpi/errors/coll/testlist | 3 +++
5 files changed, 27 insertions(+), 13 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list