[C-MPI-commits] SF.net SVN: c-mpi:[132] test/cmpi

[<jmw...@us...>]

Revision: 132
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=132&view=rev
Author:   jmwozniak
Date:     2010-05-20 18:19:24 +0000 (Thu, 20 May 2010)

Log Message:
-----------
Enabling more user configuration in mpiexec call

Modified Paths:
--------------
    Makefile.in
    configure.ac
    test/cmpi/test-startup.zsh
    test/cmpi-db/module.mk.in

Modified: Makefile.in
===================================================================
--- Makefile.in	2010-05-20 17:03:51 UTC (rev 131)
+++ Makefile.in	2010-05-20 18:19:24 UTC (rev 132)
@@ -62,8 +62,11 @@
 # MPI location
 MPI     = @USE_MPI@
 MPICC   = @USE_MPI@/bin/mpicc
-MPIEXEC = @USE_MPI@/bin/mpiexec -recvtimeout 10
-# MPIEXEC = @USE_MPI@/bin/mpiexec.hydra -f hosts
+MPIEXEC = @USE_MPI@/bin/mpiexec
+MPIEXEC = @USE_MPI@/bin/@MPIEXEC@
+# MPIARGS = -recvtimeout 10
+MPIARGS = @MPIARGS@
+# MPIARGS =  -f hosts
 MPDCHECK = tools/mpd-available.zsh @USE_MPI@/bin/mpdlistjobs
 
 # Job launch selection

Modified: configure.ac
===================================================================
--- configure.ac	2010-05-20 17:03:51 UTC (rev 131)
+++ configure.ac	2010-05-20 18:19:24 UTC (rev 132)
@@ -268,6 +268,22 @@
 fi
 AC_SUBST(USE_MPI)
 
+MPIEXEC=mpiexec
+AC_ARG_WITH(mpiexec,
+    AS_HELP_STRING([--with-mpiexec],
+                   [name of mpiexec (e.g., mpiexec.hydra)]),
+    MPIEXEC="${withval}"
+)
+AC_SUBST(MPIEXEC)
+
+MPIARGS=
+AC_ARG_WITH(mpi-args,
+    AS_HELP_STRING([--with-mpi-args],
+                   [arguments to mpiexec (e.g., -f hosts)]),
+    MPIARGS="${withval}"
+)
+AC_SUBST(MPIARGS)
+
 dnl does the mpi compiler that we found actually work?
 saveCC="$CC"
 CC="$MPICC"

Modified: test/cmpi/test-startup.zsh
===================================================================
--- test/cmpi/test-startup.zsh	2010-05-20 17:03:51 UTC (rev 131)
+++ test/cmpi/test-startup.zsh	2010-05-20 18:19:24 UTC (rev 132)
@@ -18,8 +18,7 @@
 if (( USE_COMM_WORLD == 1 ))
 then
 
-  # Monolithic execution (3 nodes, 3 clients):
-  mpiexec -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
+  eval ${LAUNCH} -n ${TOTAL} ${PROGRAM} -n ${NODES} -p reps=10 >& ${OUTPUT}
   CODE=$?
   [[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
 

Modified: test/cmpi-db/module.mk.in
===================================================================
--- test/cmpi-db/module.mk.in	2010-05-20 17:03:51 UTC (rev 131)
+++ test/cmpi-db/module.mk.in	2010-05-20 18:19:24 UTC (rev 132)
@@ -18,7 +18,6 @@
 	CLIENTS := 3
 endif
 
-
 test/cmpi-db/test-%.out: test/cmpi-db/test-%.zsh $(CMPIDB_TOOLS)
 	$(Q) "  TEST		$(@) "
 	$(E) $(MPDCHECK)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.