Fix a couple of minor issues identified by Jeff
Этот коммит содержится в:
родитель
a66fc6f293
Коммит
fe0c995f6b
@ -365,10 +365,14 @@ int orte_register_params(void)
|
||||
/* default dash-host */
|
||||
orte_default_dash_host = NULL;
|
||||
(void) mca_base_var_register ("orte", "orte", NULL, "default_dash_host",
|
||||
"Default -host setting, \"none\" to ignore environmental or default MCA param setting)",
|
||||
"Default -host setting (specify \"none\" to ignore environmental or default MCA param setting)",
|
||||
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
|
||||
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
|
||||
&orte_default_dash_host);
|
||||
if (0 == strcmp(orte_default_dash_host, "none")) {
|
||||
free(orte_default_dash_host);
|
||||
orte_default_dash_host = NULL;
|
||||
}
|
||||
|
||||
/* regex of nodes in system */
|
||||
orte_node_regex = NULL;
|
||||
|
@ -81,8 +81,8 @@ int orte_util_add_dash_host_nodes(opal_list_t *nodes,
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
opal_argv_free(mini_map);
|
||||
}
|
||||
opal_argv_free(mini_map);
|
||||
}
|
||||
opal_argv_free(host_argv);
|
||||
mini_map = NULL;
|
||||
@ -127,6 +127,13 @@ int orte_util_add_dash_host_nodes(opal_list_t *nodes,
|
||||
/* they want a specific relative node #, so
|
||||
* look it up on global pool
|
||||
*/
|
||||
if ('\0' == mapped_nodes[i][2]) {
|
||||
/* they forgot to tell us the # */
|
||||
orte_show_help("help-dash-host.txt", "dash-host:invalid-relative-node-syntax",
|
||||
true, mapped_nodes[i]);
|
||||
rc = ORTE_ERR_SILENT;
|
||||
goto cleanup;
|
||||
}
|
||||
nodeidx = strtol(&mapped_nodes[i][2], NULL, 10);
|
||||
if (nodeidx < 0 ||
|
||||
nodeidx > (int)orte_node_pool->size) {
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user