PMI: hotfix for PMI1 support
Based on thread: http://www.open-mpi.org/community/lists/devel/2014/06/index.php This commit was SVN r31909.
Этот коммит содержится в:
родитель
1107f9099e
Коммит
e85e0e926d
@ -59,6 +59,7 @@ static int mca_initialize_pmi_v2(void)
|
|||||||
* even launched by a PMI server before attempting
|
* even launched by a PMI server before attempting
|
||||||
* to use PMI */
|
* to use PMI */
|
||||||
if (NULL == getenv("PMI_FD")) {
|
if (NULL == getenv("PMI_FD")) {
|
||||||
|
opal_show_help("help-common-pmi.txt", "pmi2-init-failed", true, rc);
|
||||||
return OPAL_ERROR;
|
return OPAL_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,13 +125,6 @@ static int mca_initialize_pmi_v1(void)
|
|||||||
int spawned;
|
int spawned;
|
||||||
int rc, ret = OPAL_ERROR;
|
int rc, ret = OPAL_ERROR;
|
||||||
|
|
||||||
/* deal with a Slurm bug by first checking if we were
|
|
||||||
* even launched by a PMI server before attempting
|
|
||||||
* to use PMI */
|
|
||||||
if (NULL == getenv("PMI_FD")) {
|
|
||||||
return OPAL_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (PMI_SUCCESS != (rc = PMI_Initialized(&initialized))) {
|
if (PMI_SUCCESS != (rc = PMI_Initialized(&initialized))) {
|
||||||
OPAL_PMI_ERROR(rc, "PMI_Initialized");
|
OPAL_PMI_ERROR(rc, "PMI_Initialized");
|
||||||
return OPAL_ERROR;
|
return OPAL_ERROR;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user