Skip to content

Ensure consistency between max_procs and univ_size values - since ort… #1606

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 1, 2016
Merged

Ensure consistency between max_procs and univ_size values - since ort… #1606

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: 3 additions & 3 deletions orte/mca/ess/pmi/ess_pmi_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ static int rte_init(void)
}
orte_process_info.my_node_rank = u16;

/* get universe size */
OPAL_MODEX_RECV_VALUE(ret, OPAL_PMIX_UNIV_SIZE,
/* get max procs */
OPAL_MODEX_RECV_VALUE(ret, OPAL_PMIX_MAX_PROCS,
ORTE_PROC_MY_NAME, &u32ptr, OPAL_UINT32);
if (OPAL_SUCCESS != ret) {
error = "getting univ size";
error = "getting max procs";
goto error;
}
orte_process_info.max_procs = u32;
Expand Down
11 changes: 7 additions & 4 deletions orte/mca/ess/singleton/ess_singleton_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,17 @@ static int rte_init(void)
}
orte_process_info.my_node_rank = u16;

/* get universe size */
OPAL_MODEX_RECV_VALUE(ret, OPAL_PMIX_UNIV_SIZE,
/* get max procs */
OPAL_MODEX_RECV_VALUE(ret, OPAL_PMIX_MAX_PROCS,
ORTE_PROC_MY_NAME, &u32ptr, OPAL_UINT32);
if (OPAL_SUCCESS != ret) {
error = "getting univ size";
error = "getting max procs";
goto error;
}
orte_process_info.num_procs = u32;
orte_process_info.max_procs = u32;

/* we are a singleton, so there is only one proc in the job */
orte_process_info.num_procs = 1;
/* push into the environ for pickup in MPI layer for
* MPI-3 required info key
*/
Expand Down
2 changes: 1 addition & 1 deletion orte/orted/pmix/pmix_server_register_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ int orte_pmix_server_register_nspace(orte_job_t *jdata)
kv = OBJ_NEW(opal_value_t);
kv->key = strdup(OPAL_PMIX_UNIV_SIZE);
kv->type = OPAL_UINT32;
kv->data.uint32 = jdata->num_procs;
kv->data.uint32 = jdata->total_slots_alloc;
opal_list_append(info, &kv->super);

/* job size */
Expand Down