From 1e4bffd937dab9cb86de7c78def0d49aa49e1ebb Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 27 Dec 2016 20:42:47 -0800 Subject: [PATCH] Fix mapping directive checks Signed-off-by: Ralph Castain --- orte/mca/rmaps/base/rmaps_base_map_job.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 orte/mca/rmaps/base/rmaps_base_map_job.c diff --git a/orte/mca/rmaps/base/rmaps_base_map_job.c b/orte/mca/rmaps/base/rmaps_base_map_job.c old mode 100644 new mode 100755 index 482dd21f5f..e58540d110 --- a/orte/mca/rmaps/base/rmaps_base_map_job.c +++ b/orte/mca/rmaps/base/rmaps_base_map_job.c @@ -195,9 +195,8 @@ void orte_rmaps_base_map_job(int fd, short args, void *cbdata) /* if the user explicitly mapped-by some object, then we default * to binding to that object */ orte_mapping_policy_t mpol; - mpol = ORTE_GET_MAPPING_POLICY(orte_rmaps_base.mapping); - if (ORTE_MAPPING_POLICY_IS_SET(jdata->map->mapping) && - ORTE_MAPPING_BYBOARD < mpol && mpol < ORTE_MAPPING_BYSLOT) { + mpol = ORTE_GET_MAPPING_POLICY(jdata->map->mapping); + if (ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping)) { if (ORTE_MAPPING_BYHWTHREAD == mpol) { OPAL_SET_DEFAULT_BINDING_POLICY(jdata->map->binding, OPAL_BIND_TO_HWTHREAD); } else if (ORTE_MAPPING_BYCORE == mpol) {