Properly set the MCA parameter to indicate these functions are infrastructure so that the singleton flag does not get set.

Somehow, in changing over to the new MCA interfaces, the "set" part of that logic got lost, so the singleton flag was always being set. This should repair some of the anomalous behavior seen recently where the local host was always being used for an application process.

This commit was SVN r6757.

orte/tools/console/orteconsole.c

@@ -144,6 +144,17 @@ int main(int argc, char *argv[])
     /*
      * Intialize the ORTE environment
      */
+    /* first, set the flag telling orte_init that I am NOT a
+     * singleton, but am "infrastructure" - prevents setting
+     * up incorrect infrastructure that only a singleton would
+     * require
+     */
+
+    ret = mca_base_param_reg_int_name("orte_base", "infrastructure",
+                                "Whether we are ORTE infrastructure or an ORTE application",
+                                false, false, (int)false, NULL);
+    mca_base_param_set_int(ret, (int)true);
+    
     if (OMPI_SUCCESS != (ret = orte_init()) ) {
         opal_show_help("help-orteconsole.txt", "orteconsole:init-failure", false,
                        "orte_init()", ret);

orte/tools/orted/orted.c

@@ -249,8 +249,8 @@ int main(int argc, char *argv[])
      * up incorrect infrastructure that only a singleton would
      * require
      */
-    ret = mca_base_param_register_int("orte", "base", "infrastructure", NULL, 0);
-    mca_base_param_set_int(ret, 1);
+    ret = mca_base_param_register_int("orte", "base", "infrastructure", NULL, (int)false);
+    mca_base_param_set_int(ret, (int)true);
 
     if (ORTE_SUCCESS != (ret = orte_init())) {
         opal_show_help("help-orted.txt", "orted:init-failure", false,

orte/tools/orterun/orterun.c

@@ -282,10 +282,11 @@ int main(int argc, char *argv[])
      * require
      */
 
-    mca_base_param_reg_int_name("orte_base", "infrastructure",
+    id = mca_base_param_reg_int_name("orte_base", "infrastructure",
                                 "Whether we are ORTE infrastructure or an ORTE application",
-                                false, false, 1, NULL);
-
+                                false, false, (int)false, NULL);
+    mca_base_param_set_int(id, (int)true);
+    
     /* now call orte_init and setup the RTE */
     if (ORTE_SUCCESS != (rc = orte_init())) {
         opal_show_help("help-orterun.txt", "orterun:init-failure", true,
@@ -298,7 +299,7 @@ int main(int argc, char *argv[])
      */
     id = mca_base_param_reg_int_name("orte_debug", "daemons",
                                      "Whether to debug the ORTE daemons or not",
-                                     false, false, 0, &iparam);
+                                     false, false, (int)false, &iparam);
     if (iparam) {
         char *tmp = mca_base_param_environ_variable("orte", "debug", "daemons");
         if (ORTE_SUCCESS != (rc = opal_setenv(tmp, "1", true, &environ))) {