[Swift-commit] r4035 - usertools/mpich

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2011-01-25 13:23:13 -0600 (Tue, 25 Jan 2011)
New Revision: 4035

Added:
   usertools/mpich/mpich2-r7757.diff
Modified:
   usertools/mpich/README.txt
Log:
Slight MPICH improvements


Modified: usertools/mpich/README.txt
===================================================================
--- usertools/mpich/README.txt	2011-01-25 06:54:23 UTC (rev 4034)
+++ usertools/mpich/README.txt	2011-01-25 19:23:13 UTC (rev 4035)
@@ -5,6 +5,9 @@
 
 mpich2-r7562.diff: works with MPICH2, revision 7562
 
+mpich2-r7562.diff: works with MPICH2, revision 7757
+slight improvement over r7562
+
 mpich2-1.3.diff: obsolete due to MPICH changes
 
 

Added: usertools/mpich/mpich2-r7757.diff
===================================================================
--- usertools/mpich/mpich2-r7757.diff	                        (rev 0)
+++ usertools/mpich/mpich2-r7757.diff	2011-01-25 19:23:13 UTC (rev 4035)
@@ -0,0 +1,73 @@
+commit a68d9325d4818efe8b27637d02121efa716e769e
+Author: Pavan Balaji <balaji at mcs.anl.gov>
+Date:   Wed Jan 19 15:43:23 2011 -0600
+
+    Initial implementation of the "none" launcher. We are still having
+    some trouble with using "ssh" as the default launcher, while using
+    "none" as the default resource manager.
+
+diff --git a/src/pm/hydra/configure.in b/src/pm/hydra/configure.in
+index 58558ee..9257077 100644
+--- a/src/pm/hydra/configure.in
++++ b/src/pm/hydra/configure.in
+@@ -210,6 +210,7 @@ for hydra_bss_name in ${hydra_bss_names}; do
+ 	none|no)
+ 		hydra_bss_none=true
+ 		available_bss=`echo $available_bss none`
++		available_launchers=`echo $available_launchers none`
+ 		available_rmks=`echo $available_rmks none`
+ 		;;
+ 	*)
+diff --git a/src/pm/hydra/tools/bootstrap/external/external_init.c b/src/pm/hydra/tools/bootstrap/external/external_init.c
+index 3927556..35492d6 100644
+--- a/src/pm/hydra/tools/bootstrap/external/external_init.c
++++ b/src/pm/hydra/tools/bootstrap/external/external_init.c
+@@ -102,6 +102,11 @@ HYD_status HYDT_bsci_launcher_ll_init(void)
+     return external_launcher_init();
+ }
+ 
++HYD_status HYDT_bsci_launcher_none_init(void)
++{
++    return external_launcher_init();
++}
++
+ HYD_status HYDT_bsci_rmk_lsf_init(void)
+ {
+     return external_rmk_init();
+diff --git a/src/pm/hydra/tools/bootstrap/external/external_launch.c b/src/pm/hydra/tools/bootstrap/external/external_launch.c
+index c8f257c..05ce537 100644
+--- a/src/pm/hydra/tools/bootstrap/external/external_launch.c
++++ b/src/pm/hydra/tools/bootstrap/external/external_launch.c
+@@ -172,7 +172,8 @@ HYD_status HYDT_bscd_external_launch_procs(char **args, struct HYD_node *node_li
+ 
+         /* If launcher is 'fork', or this is the localhost, use fork
+          * to launch the process */
+-        if (!strcmp(HYDT_bsci_info.launcher, "fork") || lh) {
++        if (!strcmp(HYDT_bsci_info.launcher, "fork") ||
++            !strcmp(HYDT_bsci_info.launcher, "none") || lh) {
+             offset = exec_idx;
+ 
+             if (control_fd) {
+@@ -220,6 +221,12 @@ HYD_status HYDT_bscd_external_launch_procs(char **args, struct HYD_node *node_li
+             HYDU_print_strlist(targs + offset);
+         }
+ 
++        if (!strcmp(HYDT_bsci_info.launcher, "none")) {
++            HYDU_dump_noprefix(stdout, "HYDRA_LAUNCH: ");
++            HYDU_print_strlist(targs + offset);
++            continue;
++        }
++
+         /* The stdin pointer is a dummy value. We don't just pass it
+          * NULL, as older versions of ssh seem to freak out when no
+          * stdin socket is provided. */
+@@ -250,6 +257,9 @@ HYD_status HYDT_bscd_external_launch_procs(char **args, struct HYD_node *node_li
+         HYDU_ERR_POP(status, "demux returned error registering fd\n");
+     }
+ 
++    if (!strcmp(HYDT_bsci_info.launcher, "none"))
++        HYDU_dump_noprefix(stdout, "HYDRA_LAUNCH_END\n");
++
+   fn_exit:
+     HYDU_free_strlist(targs);
+     if (path)