Fix the hostfile parser so it correctly ignores binding directives that are just integers. Fix the create_dmns function so we don't hang if we can't get an error before creating the job map for an application.
Этот коммит содержится в:
родитель
328a408dd0
Коммит
b1bf557024
@ -295,7 +295,19 @@ static int create_dmns(orte_grpcomm_signature_t *sig,
|
||||
return ORTE_ERR_NOT_FOUND;
|
||||
}
|
||||
if (NULL == jdata->map) {
|
||||
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
|
||||
/* we haven't generated a job map yet - if we are the HNP,
|
||||
* then we should only involve ourselves. Otherwise, we have
|
||||
* no choice but to abort to avoid hangs */
|
||||
if (ORTE_PROC_IS_HNP) {
|
||||
dns = (orte_vpid_t*)malloc(sizeof(vpid));
|
||||
dns[0] = ORTE_PROC_MY_NAME->vpid;
|
||||
*ndmns = 1;
|
||||
*dmns = dns;
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
ORTE_FORCED_TERMINATE(ORTE_ERR_NOT_FOUND);
|
||||
*ndmns = 0;
|
||||
*dmns = NULL;
|
||||
return ORTE_ERR_NOT_FOUND;
|
||||
}
|
||||
/* get the array */
|
||||
|
@ -406,6 +406,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates,
|
||||
break;
|
||||
|
||||
case ORTE_HOSTFILE_STRING:
|
||||
case ORTE_HOSTFILE_INT:
|
||||
/* just ignore it */
|
||||
break;
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user