[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-10-gb88df66
Service Account
noreply at mpich.org
Thu Jun 12 13:53:47 CDT 2014
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 b88df6648432569f72a61b7dfa35c33799902708 (commit)
from 1d82f9220af2c152b87bfbcbbd9a9553fb5625a7 (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/b88df6648432569f72a61b7dfa35c33799902708
commit b88df6648432569f72a61b7dfa35c33799902708
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Thu May 22 16:31:02 2014 -0500
remove preprocessor guards from nbc tests
Nonblocking collectives are standardized and tests for them should be
run by any implementation claiming MPI-3. The level of MPI support
determined at configure time and mpiversion specified in testlist
are sufficient to restrict the tests from being run. These preprocessor
guards are not necessary.
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/test/mpi/coll/iallred.c b/test/mpi/coll/iallred.c
index d90cacf..684fd50 100644
--- a/test/mpi/coll/iallred.c
+++ b/test/mpi/coll/iallred.c
@@ -10,15 +10,6 @@
#include "mpi.h"
#include "mpitest.h"
-/* Since MPICH is currently the only NBC implementation in existence, just use
- * this quick-and-dirty #ifdef to decide whether to test the nonblocking
- * collectives. Eventually we can add a configure option or configure test, or
- * the MPI-3 standard will be released and these can be gated on a MPI_VERSION
- * check */
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
-#define TEST_NBC_ROUTINES 1
-#endif
-
int main(int argc, char *argv[])
{
MPI_Request request;
@@ -30,7 +21,6 @@ int main(int argc, char *argv[])
MPI_Comm_size(MPI_COMM_WORLD, &size);
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
assert(size == 2);
-#if defined(TEST_NBC_ROUTINES)
MPI_Iallreduce(&one,&isum,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD,&request);
MPI_Allreduce(&two,&sum,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
MPI_Wait(&request,MPI_STATUS_IGNORE);
@@ -38,15 +28,12 @@ int main(int argc, char *argv[])
assert(isum == 2);
assert(sum == 4);
-#if MTEST_HAVE_MIN_MPI_VERSION(2,2)
MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
if (MPI_SUCCESS == MPI_Iallreduce(&one, &one, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD, &request))
errs++;
-#endif
if (rank == 0 && errs == 0)
printf(" No errors\n");
-#endif
MPI_Finalize();
return 0;
diff --git a/test/mpi/coll/nonblocking.c b/test/mpi/coll/nonblocking.c
index f30d813..3a306f5 100644
--- a/test/mpi/coll/nonblocking.c
+++ b/test/mpi/coll/nonblocking.c
@@ -12,9 +12,6 @@
#include "mpi.h"
#include <stdio.h>
#include <stdlib.h>
-#include "mpitest.h"
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
-#include "mpitestconf.h"
#define NUM_INTS (2)
@@ -51,7 +48,6 @@ int main(int argc, char **argv)
MPI_Comm_size(comm, &size);
MPI_Comm_rank(comm, &rank);
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
/* enough space for every process to contribute at least NUM_INTS ints to any
* collective operation */
sbuf = malloc(NUM_INTS*size*sizeof(int));
@@ -132,8 +128,6 @@ int main(int argc, char **argv)
MPI_Iexscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req);
MPI_Wait(&req, MPI_STATUS_IGNORE);
-#endif
-
if (sbuf) free(sbuf);
if (rbuf) free(rbuf);
if (scounts) free(scounts);
diff --git a/test/mpi/coll/nonblocking2.c b/test/mpi/coll/nonblocking2.c
index 9abdb75..3de5d12 100644
--- a/test/mpi/coll/nonblocking2.c
+++ b/test/mpi/coll/nonblocking2.c
@@ -5,7 +5,7 @@
*/
/* A basic test of all 17 nonblocking collective operations specified by the
- * draft MPI-3 standard. It only exercises the intracommunicator functionality,
+ * MPI-3 standard. It only exercises the intracommunicator functionality,
* does not use MPI_IN_PLACE, and only transmits/receives simple integer types
* with relatively small counts. It does check a few fancier issues, such as
* ensuring that "premature user releases" of MPI_Op and MPI_Datatype objects
@@ -14,8 +14,6 @@
#include "mpi.h"
#include <stdlib.h>
#include <stdio.h>
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
-#include "mpitestconf.h"
#define COUNT (10)
#define PRIME (17)
@@ -28,15 +26,6 @@
} \
} while (0)
-/* Since MPICH is currently the only NBC implementation in existence, just use
- * this quick-and-dirty #ifdef to decide whether to test the nonblocking
- * collectives. Eventually we can add a configure option or configure test, or
- * the MPI-3 standard will be released and these can be gated on a MPI_VERSION
- * check */
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
-#define TEST_NBC_ROUTINES 1
-#endif
-
static void sum_fn(void *invec, void *inoutvec, int *len, MPI_Datatype *datatype)
{
int i;
@@ -66,7 +55,6 @@ int main(int argc, char **argv)
MPI_Init(&argc, &argv);
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Comm_size(MPI_COMM_WORLD, &size);
-#if defined(TEST_NBC_ROUTINES)
buf = malloc(COUNT*size*sizeof(int));
recvbuf = malloc(COUNT*size*sizeof(int));
@@ -448,8 +436,6 @@ int main(int argc, char **argv)
}
}
-#endif /* defined(TEST_NBC_ROUTINES) */
-
if (rank == 0)
printf(" No Errors\n");
diff --git a/test/mpi/coll/nonblocking3.c b/test/mpi/coll/nonblocking3.c
index 77d28c8..7708456 100644
--- a/test/mpi/coll/nonblocking3.c
+++ b/test/mpi/coll/nonblocking3.c
@@ -18,8 +18,6 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
-#include "mpitestconf.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -56,16 +54,6 @@ static int errs = 0;
} \
} while (0)
-/* Since MPICH is currently the only NBC implementation in existence, just use
- * this quick-and-dirty #ifdef to decide whether to test the nonblocking
- * collectives. Eventually we can add a configure option or configure test, or
- * the MPI-3 standard will be released and these can be gated on a MPI_VERSION
- * check */
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
-#define TEST_NBC_ROUTINES 1
-#endif
-
-#if defined(TEST_NBC_ROUTINES)
/* Intended to act like "rand_r", but we can be sure that it will exist and be
* consistent across all of comm world. Returns a number in the range
* [0,GEN_PRN_MAX] */
@@ -745,7 +733,6 @@ static void complete_something_somehow(unsigned int rndnum, int numreqs, MPI_Req
}
#undef COMPLETION_CASES
}
-#endif /* defined(TEST_NBC_ROUTINES) */
int main(int argc, char **argv)
{
@@ -753,9 +740,7 @@ int main(int argc, char **argv)
int wrank, wsize;
unsigned int seed = 0x10bc;
unsigned int post_seq, complete_seq;
-#if defined(TEST_NBC_ROUTINES)
struct laundry larr[WINDOW];
-#endif
MPI_Request reqs[WINDOW];
int outcount;
int indices[WINDOW];
@@ -766,8 +751,6 @@ int main(int argc, char **argv)
MPI_Comm_rank(MPI_COMM_WORLD, &wrank);
MPI_Comm_size(MPI_COMM_WORLD, &wsize);
-#if defined(TEST_NBC_ROUTINES)
-
/* it is critical that all processes in the communicator start with a
* consistent value for "post_seq" */
post_seq = complete_seq = gen_prn(seed);
@@ -826,8 +809,6 @@ int main(int argc, char **argv)
MPI_Comm_free(&comms[i]);
}
-#endif /* defined(TEST_NBC_ROUTINES) */
-
if (wrank == 0) {
if (errs)
printf("found %d errors\n", errs);
diff --git a/test/mpi/coll/nonblocking4.c b/test/mpi/coll/nonblocking4.c
index d977406..8cf7c25 100644
--- a/test/mpi/coll/nonblocking4.c
+++ b/test/mpi/coll/nonblocking4.c
@@ -13,8 +13,6 @@
#include <stdio.h>
#include <stdlib.h>
#include "mpitest.h"
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
-#include "mpitestconf.h"
#define NUM_INTS (2)
@@ -53,7 +51,6 @@ int main(int argc, char **argv)
MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
/* enough space for every process to contribute at least NUM_INTS ints to any
* collective operation */
sbuf = malloc(NUM_INTS*size*sizeof(int));
@@ -143,8 +140,6 @@ int main(int argc, char **argv)
MPI_Iexscan(sbuf, sbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req))
errs++;
-#endif
-
if (sbuf) free(sbuf);
if (rbuf) free(rbuf);
if (scounts) free(scounts);
-----------------------------------------------------------------------
Summary of changes:
test/mpi/coll/iallred.c | 13 -------------
test/mpi/coll/nonblocking.c | 6 ------
test/mpi/coll/nonblocking2.c | 16 +---------------
test/mpi/coll/nonblocking3.c | 19 -------------------
test/mpi/coll/nonblocking4.c | 5 -----
5 files changed, 1 insertions(+), 58 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list