Skip to content

Commit 10d6e90

Browse files
committed
Revert "plm/rsh: Propagate PMIx prefix to orted's"
This reverts commit 71da0fc. (per open-mpi#4052). Refs: open-mpi#3980 Signed-off-by: Artem Polyakov <[email protected]>
1 parent 84810ad commit 10d6e90

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

orte/mca/plm/rsh/plm_rsh_module.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
1818
* Copyright (c) 2015-2017 Research Organization for Information Science
1919
* and Technology (RIST). All rights reserved.
20-
* Copyright (c) 2017 Mellanox Technologies, Inc. All rights reserved.
2120
* $COPYRIGHT$
2221
*
2322
* Additional copyrights may follow
@@ -345,7 +344,6 @@ static int setup_launch(int *argcptr, char ***argvptr,
345344
bool found;
346345
char *lib_base=NULL, *bin_base=NULL;
347346
char *opal_prefix = getenv("OPAL_PREFIX");
348-
char *pmix_prefix = getenv("PMIX_INSTALL_PREFIX");
349347
char* full_orted_cmd = NULL;
350348

351349
/* Figure out the basenames for the libdir and bindir. This
@@ -499,16 +497,13 @@ static int setup_launch(int *argcptr, char ***argvptr,
499497
* we have to insert the orted_prefix in the right place
500498
*/
501499
(void)asprintf (&final_cmd,
502-
"%s%s%s %s%s%s PATH=%s%s$PATH ; export PATH ; "
500+
"%s%s%s PATH=%s%s$PATH ; export PATH ; "
503501
"LD_LIBRARY_PATH=%s%s$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
504502
"DYLD_LIBRARY_PATH=%s%s$DYLD_LIBRARY_PATH ; export DYLD_LIBRARY_PATH ; "
505503
"%s %s",
506504
(opal_prefix != NULL ? "OPAL_PREFIX=" : " "),
507505
(opal_prefix != NULL ? opal_prefix : " "),
508506
(opal_prefix != NULL ? " ; export OPAL_PREFIX;" : " "),
509-
(pmix_prefix != NULL ? "PMIX_INSTALL_PREFIX=" : " "),
510-
(pmix_prefix != NULL ? pmix_prefix : " "),
511-
(pmix_prefix != NULL ? " ; export PMIX_INSTALL_PREFIX;" : " "),
512507
(NULL != bin_base ? bin_base : " "),
513508
(NULL != bin_base ? ":" : " "),
514509
(NULL != lib_base ? lib_base : " "),

0 commit comments

Comments
 (0)