From cdd3dc99ca523260188552947e56998c8a057071 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 23 Mar 2016 09:55:24 -0700 Subject: [PATCH] Correct the binding for the --map-by node case - we should still use our default binding algorithms --- orte/mca/rmaps/base/rmaps_base_map_job.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/orte/mca/rmaps/base/rmaps_base_map_job.c b/orte/mca/rmaps/base/rmaps_base_map_job.c index 664d7a06197..7d77b9276a6 100644 --- a/orte/mca/rmaps/base/rmaps_base_map_job.c +++ b/orte/mca/rmaps/base/rmaps_base_map_job.c @@ -110,7 +110,8 @@ void orte_rmaps_base_map_job(int fd, short args, void *cbdata) opal_output_verbose(5, orte_rmaps_base_framework.framework_output, "mca:rmaps: nprocs %s", ORTE_VPID_PRINT(nprocs)); - if (ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) { + if (ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping) && + ORTE_MAPPING_BYNODE != ORTE_GET_MAPPING_POLICY(orte_rmaps_base.mapping)) { opal_output_verbose(5, orte_rmaps_base_framework.framework_output, "mca:rmaps mapping given - using default"); map->mapping = orte_rmaps_base.mapping;