From 9104e8195823a02a0fa7f9d0494108e5f2fc5e18 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 23 Apr 2015 20:35:54 -0700 Subject: [PATCH] When --map-by node, we should be unbound. Also remove dead code due to copy/paste error. --- orte/mca/rmaps/base/rmaps_base_map_job.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orte/mca/rmaps/base/rmaps_base_map_job.c b/orte/mca/rmaps/base/rmaps_base_map_job.c index 5adb5d1c09..e1b12c4879 100644 --- a/orte/mca/rmaps/base/rmaps_base_map_job.c +++ b/orte/mca/rmaps/base/rmaps_base_map_job.c @@ -267,9 +267,9 @@ void orte_rmaps_base_map_job(int fd, short args, void *cbdata) OPAL_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_SOCKET); } else if (ORTE_MAPPING_BYNUMA == mpol) { OPAL_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_NUMA); - } else if (ORTE_MAPPING_BYHWTHREAD == mpol) { - OPAL_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_CORE); } + } else if (ORTE_MAPPING_BYNODE == mpol || ORTE_MAPPING_BYBOARD == mpol) { + jdata->map->binding = OPAL_BIND_TO_NONE; } else if (nprocs <= 2) { /* if nothing was specified, then we default to a policy * based on number of procs and cpus_per_rank */