Skip to content

Fix the dist mapper option #1693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2016
+8 −4
Merged

Fix the dist mapper option #1693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions orte/mca/rmaps/base/rmaps_base_frame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
orte_rmaps_base.slot_list = NULL;
orte_rmaps_base.mapping = 0;
orte_rmaps_base.ranking = 0;
orte_rmaps_base.device = NULL;

/* if a topology file was given, then set our topology
* from it. Even though our actual topology may differ,
Expand Down Expand Up @@ -614,9 +615,10 @@ int orte_rmaps_base_set_mapping_policy(orte_mapping_policy_t *policy,
}

opal_output_verbose(5, orte_rmaps_base_framework.framework_output,
"%s rmaps:base set policy with %s",
"%s rmaps:base set policy with %s device %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
(NULL == inspec) ? "NULL" : inspec);
(NULL == inspec) ? "NULL" : inspec,
(NULL == device) ? "NULL" : "NONNULL");

if (NULL == inspec) {
ORTE_SET_MAPPING_POLICY(tmp, ORTE_MAPPING_BYSOCKET);
Expand Down Expand Up @@ -719,12 +721,14 @@ int orte_rmaps_base_set_mapping_policy(orte_mapping_policy_t *policy,
* we need to treat those hwthreads as separate cpus
*/
opal_hwloc_use_hwthreads_as_cpus = true;
} else if ( NULL != device && 0 == strncasecmp(spec, "dist", len)) {
} else if (0 == strncasecmp(spec, "dist", len)) {
if (NULL != rmaps_dist_device) {
if (NULL != (pch = strchr(rmaps_dist_device, ':'))) {
*pch = '\0';
}
*device = strdup(rmaps_dist_device);
if (NULL != device) {
*device = strdup(rmaps_dist_device);
}
ORTE_SET_MAPPING_POLICY(tmp, ORTE_MAPPING_BYDIST);
} else {
orte_show_help("help-orte-rmaps-base.txt", "device-not-specified", true);
Expand Down