[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b4-81-g2dba0ef
Service Account
noreply at mpich.org
Thu Aug 6 13:42:19 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 2dba0efc81f00b3b41b6f1dfb71eef76a243bdd9 (commit)
from 4096fe9f4d97ce54244995c5e459e26637be272f (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/2dba0efc81f00b3b41b6f1dfb71eef76a243bdd9
commit 2dba0efc81f00b3b41b6f1dfb71eef76a243bdd9
Author: Lena Oden <loden at anl.gov>
Date: Wed Aug 5 11:05:14 2015 -0500
Remove old USE_STRICT_MPI macros
MPI_Comm_idup and MPI_Create_groups are now part of the MPI3
standard, so these Macros are not neccessary any longer.
Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>
diff --git a/test/mpi/comm/comm_create_group.c b/test/mpi/comm/comm_create_group.c
index c89760b..ee0a8df 100644
--- a/test/mpi/comm/comm_create_group.c
+++ b/test/mpi/comm/comm_create_group.c
@@ -4,7 +4,6 @@
* See COPYRIGHT in top-level directory.
*/
#include "mpi.h"
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
#include "mpitestconf.h"
#include <stdio.h>
#include <string.h>
@@ -39,14 +38,12 @@ int main(int argc, char *argv[])
MPI_Group_excl(world_group, size / 2, excl, &even_group);
MPI_Group_free(&world_group);
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
if (rank % 2 == 0) {
/* Even processes create a group for themselves */
MPI_Comm_create_group(MPI_COMM_WORLD, even_group, 0, &even_comm);
MPI_Barrier(even_comm);
MPI_Comm_free(&even_comm);
}
-#endif /* USE_STRICT_MPI */
MPI_Group_free(&even_group);
MPI_Barrier(MPI_COMM_WORLD);
diff --git a/test/mpi/comm/comm_group_half.c b/test/mpi/comm/comm_group_half.c
index e6a5bbe..bd98ab3 100644
--- a/test/mpi/comm/comm_group_half.c
+++ b/test/mpi/comm/comm_group_half.c
@@ -6,7 +6,6 @@
#include <stdio.h>
#include <mpi.h>
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
#include "mpitestconf.h"
int main(int argc, char **argv)
@@ -26,13 +25,11 @@ int main(int argc, char **argv)
range[0][2] = 1;
MPI_Group_range_incl(full_group, 1, range, &half_group);
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
if (rank <= size / 2) {
MPI_Comm_create_group(MPI_COMM_WORLD, half_group, 0, &comm);
MPI_Barrier(comm);
MPI_Comm_free(&comm);
}
-#endif /* USE_STRICT_MPI */
MPI_Group_free(&half_group);
MPI_Group_free(&full_group);
diff --git a/test/mpi/comm/comm_group_rand.c b/test/mpi/comm/comm_group_rand.c
index 681242d..7f609c0 100644
--- a/test/mpi/comm/comm_group_rand.c
+++ b/test/mpi/comm/comm_group_rand.c
@@ -7,7 +7,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <mpi.h>
-/* USE_STRICT_MPI may be defined in mpitestconf.h */
#include "mpitestconf.h"
#define LOOPS 100
@@ -42,13 +41,11 @@ int main(int argc, char **argv)
MPI_Group_incl(full_group, count, ranks, &sub_group);
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
if (included[rank]) {
MPI_Comm_create_group(MPI_COMM_WORLD, sub_group, 0, &comm);
MPI_Barrier(comm);
MPI_Comm_free(&comm);
}
-#endif /* USE_STRICT_MPI */
MPI_Group_free(&sub_group);
}
diff --git a/test/mpi/comm/comm_idup.c b/test/mpi/comm/comm_idup.c
index fc41ae1..4aa94ea 100644
--- a/test/mpi/comm/comm_idup.c
+++ b/test/mpi/comm/comm_idup.c
@@ -10,13 +10,6 @@
#include "mpi.h"
#include "mpitest.h"
-/* This is a temporary #ifdef to control whether we test this functionality. A
- * configure-test or similar would be better. Eventually the MPI-3 standard
- * will be released and this can be gated on a MPI_VERSION check */
-#if !defined(USE_STRICT_MPI) && defined(MPICH)
-#define TEST_IDUP 1
-#endif
-
/* assert-like macro that bumps the err count and emits a message */
#define check(x_) \
do { \
@@ -47,7 +40,6 @@ int main(int argc, char **argv)
MPI_Abort(MPI_COMM_WORLD, 1);
}
-#ifdef TEST_IDUP
/* 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
@@ -130,7 +122,6 @@ int main(int argc, char **argv)
MPI_Comm_free(&newcomm);
MPI_Comm_free(&ic);
-#endif /* TEST_IDUP */
MPI_Reduce((rank == 0 ? MPI_IN_PLACE : &errs), &errs, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD);
if (rank == 0) {
diff --git a/test/mpi/threads/comm/comm_create_group_threads.c b/test/mpi/threads/comm/comm_create_group_threads.c
index 9eaeaf9..74c955d 100644
--- a/test/mpi/threads/comm/comm_create_group_threads.c
+++ b/test/mpi/threads/comm/comm_create_group_threads.c
@@ -40,7 +40,6 @@ MTEST_THREAD_RETURN_TYPE test_comm_create_group(void *arg)
* ranks join an even comm and threads on odd ranks join the odd comm.
*/
-#ifndef USE_STRICT_MPI
if (verbose)
printf("%d: Thread %d - Comm_create_group %d start\n", rank, *(int *) arg, i);
MPI_Comm_create_group(comms[*(int *) arg], world_group, *(int *) arg /* tag */ , &comm);
@@ -48,7 +47,6 @@ MTEST_THREAD_RETURN_TYPE test_comm_create_group(void *arg)
MPI_Comm_free(&comm);
if (verbose)
printf("%d: Thread %d - Comm_create_group %d finish\n", rank, *(int *) arg, i);
-#endif /* USE_STRICT_MPI */
MPI_Group_free(&world_group);
diff --git a/test/mpi/threads/comm/testlist.in b/test/mpi/threads/comm/testlist.in
index cbc4cb0..bbc7f8a 100644
--- a/test/mpi/threads/comm/testlist.in
+++ b/test/mpi/threads/comm/testlist.in
@@ -2,7 +2,7 @@ ctxdup 4
dup_leak_test 2
comm_dup_deadlock 4
comm_create_threads 4
-comm_create_group_threads 4
+comm_create_group_threads 4 mpiversion=3.0
@comm_overlap@ comm_idup 4 mpiversion=3.0
@comm_overlap@ ctxidup 4 mpiversion=3.0
idup_nb 4 mpiversion=3.0
-----------------------------------------------------------------------
Summary of changes:
test/mpi/comm/comm_create_group.c | 3 ---
test/mpi/comm/comm_group_half.c | 3 ---
test/mpi/comm/comm_group_rand.c | 3 ---
test/mpi/comm/comm_idup.c | 9 ---------
test/mpi/threads/comm/comm_create_group_threads.c | 2 --
test/mpi/threads/comm/testlist.in | 2 +-
6 files changed, 1 insertions(+), 21 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list