Skip to content

Commit c86fede

Browse files
author
Ralph Castain
committed
Fix typo for rmaps_base_oversubscribe
Causes the MCA param to be ignored, while the cmd line option still works. Signed-off-by: Ralph Castain <rhc@open-mpi.org>
1 parent c5292a0 commit c86fede

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

orte/mca/rmaps/base/rmaps_base_map_job.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,11 @@ void orte_rmaps_base_map_job(int fd, short args, void *cbdata)
182182
if (!(ORTE_MAPPING_SUBSCRIBE_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(jdata->map->mapping))) {
183183
if (!(ORTE_MAPPING_SUBSCRIBE_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping))) {
184184
ORTE_SET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_NO_OVERSUBSCRIBE);
185+
} else if (ORTE_MAPPING_NO_OVERSUBSCRIBE & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) {
186+
ORTE_SET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_NO_OVERSUBSCRIBE);
185187
} else {
186-
/* pass along the directive */
188+
ORTE_UNSET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_NO_OVERSUBSCRIBE);
187189
ORTE_SET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_SUBSCRIBE_GIVEN);
188-
if (ORTE_MAPPING_NO_OVERSUBSCRIBE & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) {
189-
ORTE_SET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_NO_OVERSUBSCRIBE);
190-
} else {
191-
ORTE_UNSET_MAPPING_DIRECTIVE(jdata->map->mapping, ORTE_MAPPING_NO_OVERSUBSCRIBE);
192-
}
193190
}
194191
}
195192

0 commit comments

Comments
 (0)