[mpich2-commits] r4082 - in mpich2/trunk/src/pm/hydra: . launcher/mpiexec

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-15 19:14:29 -0500 (Sun, 15 Mar 2009)
New Revision: 4082

Modified:
   mpich2/trunk/src/pm/hydra/README
   mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
Log:
Allow the bootstrap server to be specified using an environment variable.

Modified: mpich2/trunk/src/pm/hydra/README
===================================================================
--- mpich2/trunk/src/pm/hydra/README	2009-03-15 22:54:46 UTC (rev 4081)
+++ mpich2/trunk/src/pm/hydra/README	2009-03-16 00:14:29 UTC (rev 4082)
@@ -69,6 +69,9 @@
 
  $ mpiexec --bootstrap fork -f hosts -n 4 ./app
 
+This can also be controlled by using the HYDRA_BOOTSTRAP environment
+variable.
+
 The default bootstrap server is ssh.
 
 

Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-15 22:54:46 UTC (rev 4081)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-16 00:14:29 UTC (rev 4082)
@@ -435,6 +435,14 @@
         }
     }
 
+    /*
+     * We use the following priority order to specify the bootstrap server:
+     *    1. Specified to mpiexec using --bootstrap
+     *    2. Specified through the environment HYDRA_BOOTSTRAP
+     *    3. If nothing is given, we use the default bootstrap server
+     */
+    if (handle.bootstrap == NULL && getenv("HYDRA_BOOTSTRAP"))
+        handle.bootstrap = MPIU_Strdup(getenv("HYDRA_BOOTSTRAP"));
     if (handle.bootstrap == NULL)
         handle.bootstrap = MPIU_Strdup(HYDRA_DEFAULT_BSS);