[mpich2-commits] r4052 - in mpich2/trunk/src/pm/hydra: bootstrap pm/central

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-13 03:53:08 -0500 (Fri, 13 Mar 2009)
New Revision: 4052

Modified:
   mpich2/trunk/src/pm/hydra/bootstrap/Makefile.sm
   mpich2/trunk/src/pm/hydra/pm/central/central_launch.c
Log:
We were not handling the case where mpiexec is called from a relative
path. In that case, finding the path to the proxy executable is a little
tricky. We need a cleaner approach to finding where the proxy is; this
code is becoming quite hacky.


Modified: mpich2/trunk/src/pm/hydra/bootstrap/Makefile.sm
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/Makefile.sm	2009-03-13 08:36:19 UTC (rev 4051)
+++ mpich2/trunk/src/pm/hydra/bootstrap/Makefile.sm	2009-03-13 08:53:08 UTC (rev 4052)
@@ -4,5 +4,5 @@
 #     See COPYRIGHT in top-level directory.
 #
 
-SUBDIRS_hydra_bss_names = ssh fork .
+SUBDIRS_hydra_bss_names = ssh fork
 SUBDIRS = utils @hydra_bss_names@ .

Modified: mpich2/trunk/src/pm/hydra/pm/central/central_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/central/central_launch.c	2009-03-13 08:36:19 UTC (rev 4051)
+++ mpich2/trunk/src/pm/hydra/pm/central/central_launch.c	2009-03-13 08:53:08 UTC (rev 4052)
@@ -129,6 +129,11 @@
 
             for (arg = 0; partition->args[arg]; arg++);
             i = 0;
+            if (handle.base_path[0] && (handle.base_path[0] != '/')) {
+                /* This should be a relative path; add the wdir as well */
+                path_str[i++] = MPIU_Strdup(handle.wdir);
+                path_str[i++] = MPIU_Strdup("/");
+            }
             path_str[i++] = MPIU_Strdup(handle.base_path);
             path_str[i++] = MPIU_Strdup("proxy");
             path_str[i] = NULL;