Revert "Check for OPAL_PREFIX and set corresponding PMIX_PREFIX if found"
This reverts commit 3744967adb8dcb2fc7b802c46bc6153ecef59ce6. Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
родитель
a7a30424cb
Коммит
e94786f4b7
@ -9,7 +9,6 @@
|
|||||||
* University of Stuttgart. All rights reserved.
|
* University of Stuttgart. All rights reserved.
|
||||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
* Copyright (c) 2017 Intel, Inc. All rights reserved.
|
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -29,7 +28,6 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "opal/util/opal_environ.h"
|
|
||||||
#include "orte/mca/errmgr/errmgr.h"
|
#include "orte/mca/errmgr/errmgr.h"
|
||||||
#include "orte/util/show_help.h"
|
#include "orte/util/show_help.h"
|
||||||
#include "orte/runtime/orte_wait.h"
|
#include "orte/runtime/orte_wait.h"
|
||||||
@ -41,7 +39,6 @@ int orte_ess_base_std_prolog(void)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
char *error = NULL;
|
char *error = NULL;
|
||||||
char *evar;
|
|
||||||
|
|
||||||
/* Initialize the ORTE data type support */
|
/* Initialize the ORTE data type support */
|
||||||
if (ORTE_SUCCESS != (ret = orte_dt_init())) {
|
if (ORTE_SUCCESS != (ret = orte_dt_init())) {
|
||||||
@ -59,10 +56,6 @@ int orte_ess_base_std_prolog(void)
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* check for OPAL_PREFIX */
|
|
||||||
if (NULL != (evar = getenv("OPAL_PREFIX"))) {
|
|
||||||
opal_setenv("PMIX_PREFIX", evar, false, &environ);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ORTE_SUCCESS;
|
return ORTE_SUCCESS;
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user