[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-410-gb54d7e0

[mysql vizuser]

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  b54d7e0831d6f617c3971e05b643a47d06413423 (commit)
      from  b6a06cd3e6cee9d351bee7cb9ca35c422a5f73a0 (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/b54d7e0831d6f617c3971e05b643a47d06413423

commit b54d7e0831d6f617c3971e05b643a47d06413423
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Jul 30 17:31:27 2013 -0500

    Ensure fault tolerance tests only run with hydra.
    
    Fault tolerance is only supported under hydra, so we configure the
    tests to run only when it is the primary PM. Fixes #1914.
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/test/mpi/Makefile.am b/test/mpi/Makefile.am
index 0ffd429..c314e09 100644
--- a/test/mpi/Makefile.am
+++ b/test/mpi/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/Makefile.mtest
 ACLOCAL_AMFLAGS = -I confdb
 
 static_subdirs = util attr basic datatype coll comm errhan group info init \
-                 pt2pt rma topo errors manual perf mpi_t ft
+                 pt2pt rma topo errors manual perf mpi_t
 all_lang_subdirs = f77 cxx f90
 
 # DIST_SUBDIRS must be a superset of SUBDIRS, and automake must be able to
@@ -19,7 +19,7 @@ all_lang_subdirs = f77 cxx f90
 # duplication because automake is able to "see" into simple variable
 # assignments that are not driven by a configure @-substitution variable.
 DIST_SUBDIRS = $(static_subdirs) io $(all_lang_subdirs) threads spawn .
-SUBDIRS      = $(static_subdirs) $(iodir) $(otherlangs) $(threadsdir) $(spawndir) $(ckpointdir) .
+SUBDIRS      = $(static_subdirs) $(iodir) $(otherlangs) $(threadsdir) $(spawndir) $(ckpointdir) $(ftdir) .
 
 EXTRA_DIST = maint/common.defn maint/f77tof90.in maint/testmerge.in maint/updatefiles testlist.in
 
diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac
index 55e1790..565842a 100644
--- a/test/mpi/configure.ac
+++ b/test/mpi/configure.ac
@@ -177,6 +177,57 @@ AC_ARG_WITH(mpi,
 		[Use the selected MPI; compilation scripts for mpicc,
 		mpif77 and mpicxx should be in dir/bin])],,)
 
+AC_ARG_WITH(pm,
+	AC_HELP_STRING([--with-pm=name],
+		[Specify the process manager for MPICH.  "no" or "none" are
+                 valid values.  Multiple process managers may be specified as
+                 long as they all use the same pmi interface by separating them
+                 with colons.  The mpiexec for the first named process manager
+                 will be installed.  Example: "--with-pm=hydra:mpd:gforker"
+                 builds the three process managers hydra, mpd and gforker;
+                 only the mpiexec from hydra is installed into the bin
+                 directory.]),,with_pm=default)
+
+if test "$with_pm" = "none" ; then
+    # add "none" as synonym for "no" to agree with older erroneous docs
+    with_pm="no"
+fi
+if test "$MPID_NO_PM" = yes ; then
+    if test "$with_pm" != "default" -a "$with_pm" != no ; then
+        AC_MSG_ERROR([The PM chosen ($with_pm) is is not valid for the selected device ($with_device)])
+    fi
+    # This is used to change with_pm=default to with_pm=no in the case
+    # where the device does not want a PM
+    with_pm=no
+fi
+if test -z "$with_pm" ; then
+    with_pm="no"
+fi
+if test "$with_pmi" = "uni" -a "$with_pm" = "default" ; then
+    with_pm="no"
+fi
+if test "$with_pm" = "default" -o "$with_pm" = "yes" ; then
+   if test ! -z "$MPID_DEFAULT_PM" ; then
+      with_pm=${MPID_DEFAULT_PM}
+   else
+      with_pm=hydra
+   fi
+fi
+
+# Get the first pm specified
+if test "$with_pm" != "no" ; then
+    first_pm="`echo $with_pm | sed -e 's/:.*//' -e 's/,.*//'`"
+else
+    first_pm=""
+fi
+
+# Only run the fault tolerance tests if hydra is the primary PM
+ftdir="#ft"
+if test "$first_pm" = "hydra"; then
+    ftdir="ft"
+fi
+AC_SUBST(ftdir)
+
 AC_ARG_WITH(config-args,
 	[AC_HELP_STRING([--with-config-args=filename],
 		[Specify configure argument file that contains the
diff --git a/test/mpi/testlist.in b/test/mpi/testlist.in
index 5d32b47..f822165 100644
--- a/test/mpi/testlist.in
+++ b/test/mpi/testlist.in
@@ -22,4 +22,4 @@ topo
 @errordir@
 @threadsdir@
 @ckpointdir@
-ft
+ at ftdir@

-----------------------------------------------------------------------

Summary of changes:
 test/mpi/Makefile.am  |    4 +-
 test/mpi/configure.ac |   51 +++++++++++++++++++++++++++++++++++++++++++++++++
 test/mpi/testlist.in  |    2 +-
 3 files changed, 54 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository