Addendum to r9930: missed a chunk of the rsh pls to use the basename
of $libdir and $bindir (i.e., was correctly doing local launches, but was still using $prefix/lib and $prefix/bin for remote launches). [Re-]Fixes OFED bug 59. This commit was SVN r10207. The following SVN revision numbers were found above: r9930 --> open-mpi/ompi@1d6902296c
Этот коммит содержится в:
родитель
5c2d2fc02a
Коммит
4882dc0e2c
@ -855,12 +855,13 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
|
||||
if (NULL != prefix_dir) {
|
||||
if (remote_bash) {
|
||||
asprintf (&argv[local_exec_index],
|
||||
"PATH=%s/bin:$PATH ; export PATH ; "
|
||||
"LD_LIBRARY_PATH=%s/lib:$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
|
||||
"%s/bin/%s",
|
||||
prefix_dir,
|
||||
prefix_dir,
|
||||
prefix_dir, mca_pls_rsh_component.orted);
|
||||
"PATH=%s/%s:$PATH ; export PATH ; "
|
||||
"LD_LIBRARY_PATH=%s/%s:$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
|
||||
"%s/%s/%s",
|
||||
prefix_dir, bin_base,
|
||||
prefix_dir, lib_base,
|
||||
prefix_dir, bin_base,
|
||||
mca_pls_rsh_component.orted);
|
||||
}
|
||||
if (remote_csh) {
|
||||
/* [t]csh is a bit more challenging -- we
|
||||
@ -872,18 +873,19 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
|
||||
See this thread for more details:
|
||||
http://www.open-mpi.org/community/lists/users/2006/01/0517.php. */
|
||||
asprintf (&argv[local_exec_index],
|
||||
"set path = ( %s/bin $path ) ; "
|
||||
"set path = ( %s/%s $path ) ; "
|
||||
"if ( $?LD_LIBRARY_PATH == 1 ) "
|
||||
"set OMPI_have_llp ; "
|
||||
"if ( $?LD_LIBRARY_PATH == 0 ) "
|
||||
"setenv LD_LIBRARY_PATH %s/lib ; "
|
||||
"setenv LD_LIBRARY_PATH %s/%s ; "
|
||||
"if ( $?OMPI_have_llp == 1 ) "
|
||||
"setenv LD_LIBRARY_PATH %s/lib:$LD_LIBRARY_PATH ; "
|
||||
"%s/bin/%s",
|
||||
prefix_dir,
|
||||
prefix_dir,
|
||||
prefix_dir,
|
||||
prefix_dir, mca_pls_rsh_component.orted);
|
||||
"setenv LD_LIBRARY_PATH %s/%s:$LD_LIBRARY_PATH ; "
|
||||
"%s/%s/%s",
|
||||
prefix_dir, bin_base,
|
||||
prefix_dir, lib_base,
|
||||
prefix_dir, lib_base,
|
||||
prefix_dir, bin_base,
|
||||
mca_pls_rsh_component.orted);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user