From 0d9826409758e24c8398084aca8ca6ba04dccec9 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 24 Mar 2007 16:16:16 +0000 Subject: [PATCH] Fix the nolocal option on the OMPI trunk This commit was SVN r14138. --- orte/mca/rmaps/base/rmaps_base_open.c | 12 ++++++------ orte/tools/orterun/orterun.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/orte/mca/rmaps/base/rmaps_base_open.c b/orte/mca/rmaps/base/rmaps_base_open.c index 9d231dedc4..8fbb64ed16 100644 --- a/orte/mca/rmaps/base/rmaps_base_open.c +++ b/orte/mca/rmaps/base/rmaps_base_open.c @@ -121,10 +121,10 @@ int orte_rmaps_base_open(void) /* Should we schedule on the local node or not? */ - mca_base_param_reg_int_name("rmaps", "base_schedule_local", - "If nonzero, allow scheduling MPI applications on the same node as mpirun (default). If zero, do not schedule any MPI applications on the same node as mpirun", - false, false, 1, &value); - if (0 == value) { + mca_base_param_reg_int_name("rmaps", "base_no_schedule_local", + "If false, allow scheduling MPI applications on the same node as mpirun (default). If true, do not schedule any MPI applications on the same node as mpirun", + false, false, (int)false, &value); + if ((int)true == value) { orte_rmaps_base.no_use_local = true; } else { orte_rmaps_base.no_use_local = false; @@ -133,8 +133,8 @@ int orte_rmaps_base_open(void) /* Should we oversubscribe or not? */ mca_base_param_reg_int_name("rmaps", "base_no_oversubscribe", - "If nonzero, then do not allow oversubscription of nodes - mpirun will return an error if there aren't enough nodes to launch all processes without oversubscribing", - false, false, 0, &value); + "If true, then do not allow oversubscription of nodes - mpirun will return an error if there aren't enough nodes to launch all processes without oversubscribing", + false, false, (int)false, &value); if ((int)false == value) { orte_rmaps_base.oversubscribe = true; /** default condition that allows oversubscription */ } else { diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c index e594e0e46a..39adfcf83c 100644 --- a/orte/tools/orterun/orterun.c +++ b/orte/tools/orterun/orterun.c @@ -252,7 +252,7 @@ opal_cmd_line_init_t cmd_line_init[] = { "List of hosts to invoke processes on" }, /* OSC mpiexec-like arguments */ - { "rmaps", "base", "schedule_local", '\0', "nolocal", "nolocal", 0, + { "rmaps", "base", "no_schedule_local", '\0', "nolocal", "nolocal", 0, NULL, OPAL_CMD_LINE_TYPE_BOOL, "Do not run any MPI applications on the local node" },