Skip to content

Commit 71da0fc

Browse files
committed
plm/rsh: Propagate PMIx prefix to orted's
Signed-off-by: Artem Polyakov <[email protected]>
1 parent 500c8be commit 71da0fc

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

orte/mca/plm/rsh/plm_rsh_module.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
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.
2021
* $COPYRIGHT$
2122
*
2223
* Additional copyrights may follow
@@ -344,6 +345,7 @@ static int setup_launch(int *argcptr, char ***argvptr,
344345
bool found;
345346
char *lib_base=NULL, *bin_base=NULL;
346347
char *opal_prefix = getenv("OPAL_PREFIX");
348+
char *pmix_prefix = getenv("PMIX_INSTALL_PREFIX");
347349
char* full_orted_cmd = NULL;
348350

349351
/* Figure out the basenames for the libdir and bindir. This
@@ -497,13 +499,16 @@ static int setup_launch(int *argcptr, char ***argvptr,
497499
* we have to insert the orted_prefix in the right place
498500
*/
499501
(void)asprintf (&final_cmd,
500-
"%s%s%s PATH=%s%s$PATH ; export PATH ; "
502+
"%s%s%s %s%s%s PATH=%s%s$PATH ; export PATH ; "
501503
"LD_LIBRARY_PATH=%s%s$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
502504
"DYLD_LIBRARY_PATH=%s%s$DYLD_LIBRARY_PATH ; export DYLD_LIBRARY_PATH ; "
503505
"%s %s",
504506
(opal_prefix != NULL ? "OPAL_PREFIX=" : " "),
505507
(opal_prefix != NULL ? opal_prefix : " "),
506508
(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;" : " "),
507512
(NULL != bin_base ? bin_base : " "),
508513
(NULL != bin_base ? ":" : " "),
509514
(NULL != lib_base ? lib_base : " "),

0 commit comments

Comments
 (0)