ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Revert "plm/rsh: Propagate PMIx prefix to orted's"

Просмотр исходного кода 
This reverts commit 71da0fcbef.
(per https://github.com/open-mpi/ompi/pull/4052).
Refs: https://github.com/open-mpi/ompi/issues/3980

Signed-off-by: Artem Polyakov <artpol84@gmail.com>
Этот коммит содержится в:
Artem Polyakov 2017-08-14 21:31:22 +07:00
родитель 84810adc24
Коммит 10d6e90bf5
1 изменённых файлов: 1 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
orte/mca/plm/rsh/plm_rsh_module.c
Просмотреть файл

@ -17,7 +17,6 @@
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2015-2017 Research Organization for Information Science * Copyright (c) 2015-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2017 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -345,7 +344,6 @@ static int setup_launch(int *argcptr, char ***argvptr,
bool found; bool found;
char *lib_base=NULL, *bin_base=NULL; char *lib_base=NULL, *bin_base=NULL;
char *opal_prefix = getenv("OPAL_PREFIX"); char *opal_prefix = getenv("OPAL_PREFIX");
char *pmix_prefix = getenv("PMIX_INSTALL_PREFIX");
char* full_orted_cmd = NULL; char* full_orted_cmd = NULL;
/* Figure out the basenames for the libdir and bindir. This /* Figure out the basenames for the libdir and bindir. This
@ -499,16 +497,13 @@ static int setup_launch(int *argcptr, char ***argvptr,
* we have to insert the orted_prefix in the right place * we have to insert the orted_prefix in the right place
*/ */
(void)asprintf (&final_cmd, (void)asprintf (&final_cmd,
"%s%s%s %s%s%s PATH=%s%s$PATH ; export PATH ; " "%s%s%s PATH=%s%s$PATH ; export PATH ; "
"LD_LIBRARY_PATH=%s%s$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; " "LD_LIBRARY_PATH=%s%s$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
"DYLD_LIBRARY_PATH=%s%s$DYLD_LIBRARY_PATH ; export DYLD_LIBRARY_PATH ; " "DYLD_LIBRARY_PATH=%s%s$DYLD_LIBRARY_PATH ; export DYLD_LIBRARY_PATH ; "
"%s %s", "%s %s",
(opal_prefix != NULL ? "OPAL_PREFIX=" : " "), (opal_prefix != NULL ? "OPAL_PREFIX=" : " "),
(opal_prefix != NULL ? opal_prefix : " "), (opal_prefix != NULL ? opal_prefix : " "),
(opal_prefix != NULL ? " ; export OPAL_PREFIX;" : " "), (opal_prefix != NULL ? " ; export OPAL_PREFIX;" : " "),
(pmix_prefix != NULL ? "PMIX_INSTALL_PREFIX=" : " "),
(pmix_prefix != NULL ? pmix_prefix : " "),
(pmix_prefix != NULL ? " ; export PMIX_INSTALL_PREFIX;" : " "),
(NULL != bin_base ? bin_base : " "), (NULL != bin_base ? bin_base : " "),
(NULL != bin_base ? ":" : " "), (NULL != bin_base ? ":" : " "),
(NULL != lib_base ? lib_base : " "), (NULL != lib_base ? lib_base : " "),