From b98a363ccfadf7d7203dffab5162011dd2dd0562 Mon Sep 17 00:00:00 2001 From: rhc54 Date: Wed, 23 Mar 2016 12:00:42 -0700 Subject: [PATCH] Merge pull request #1489 from rhc54/topic/bind Correct the binding for the --map-by node case (cherry picked from commit dec23f3d39cac7a88b86ad5667052ae20c05ccd3) --- 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 663cde8159..e7283b3f8d 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;