Skip to content

Use the node index to compare to daemon vpid when identifying procs t… #3365

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
Apr 25, 2017
Merged

Use the node index to compare to daemon vpid when identifying procs t… #3365

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions orte/mca/odls/base/odls_base_default_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,9 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,
if (!ORTE_FLAG_TEST(pptr, ORTE_PROC_FLAG_LOCAL)) {
/* not on the local list */
OPAL_OUTPUT_VERBOSE((5, orte_odls_base_framework.framework_output,
"%s adding proc %s to my local list",
"%s[%s:%d] adding proc %s to my local list",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
__FILE__, __LINE__,
ORTE_NAME_PRINT(&pptr->name)));
/* keep tabs of the number of local procs */
jdata->num_local_procs++;
Expand Down Expand Up @@ -439,8 +440,9 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,
if (!ORTE_FLAG_TEST(pptr, ORTE_PROC_FLAG_LOCAL)) {
/* not on the local list */
OPAL_OUTPUT_VERBOSE((5, orte_odls_base_framework.framework_output,
"%s adding proc %s to my local list",
"%s[%s:%d] adding proc %s to my local list",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
__FILE__, __LINE__,
ORTE_NAME_PRINT(&pptr->name)));
/* keep tabs of the number of local procs */
jdata->num_local_procs++;
Expand Down
5 changes: 4 additions & 1 deletion orte/mca/rmaps/base/rmaps_base_binding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,12 +843,15 @@ int orte_rmaps_base_compute_bindings(orte_job_t *jdata)
*/
execute:
/* initialize */
opal_output_verbose(5, orte_rmaps_base_framework.framework_output,
"mca:rmaps: computing bindings for job %s",
ORTE_JOBID_PRINT(jdata->jobid));

for (i=0; i < jdata->map->nodes->size; i++) {
if (NULL == (node = (orte_node_t*)opal_pointer_array_get_item(jdata->map->nodes, i))) {
continue;
}
if (!orte_no_vm && (int)ORTE_PROC_MY_NAME->vpid != i) {
if (!orte_no_vm && (int)ORTE_PROC_MY_NAME->vpid != node->index) {
continue;
}
if (!orte_do_not_launch) {
Expand Down