Skip to content

external prrte: Create symlink to prrterun in bindir. #9962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

external prrte: Create symlink to prrterun in bindir. #9962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions config/ompi_setup_prrte.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
AM_CONDITIONAL([OMPI_WANT_PRRTE],
[test "$prrte_setup_internal_happy" = "1" -o "$prrte_setup_external_happy" = "1"])

AM_CONDITIONAL([OMPI_EXTERNAL_PRRTE],
[test "$opal_prrte_mode" = "external"])

AC_DEFINE_UNQUOTED([OMPI_HAVE_PRRTE],
[$OMPI_HAVE_PRRTE],
[Whether or not PRRTE is available])
Expand Down Expand Up @@ -268,13 +271,15 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_EXTERNAL], [
AS_IF([test "$setup_prrte_external_happy" = "yes"],
[AS_IF([test -n "$with_prrte"],
[PRTE_PATH="${with_prrte}/bin/prte"
AS_IF([test ! -r ${PRTE_PATH}], [AC_MSG_ERROR([Could not find prte binary at $PRTE_PATH])])],
AS_IF([test ! -r ${PRTE_PATH}],
[AC_MSG_ERROR([Could not find prte binary at $PRTE_PATH])],
[PRTE_PATH="${with_prrte}/bin"])],
[PRTE_PATH=""
OPAL_WHICH([prte], [PRTE_PATH])
AS_IF([tets -z "$PRTE_PATH"],
[AC_MSG_WARN([Could not find prte in PATH])
setup_prrte_external_happy=no])])])

setup_prrte_external_happy=no],
[PRTE_PATH="`echo $PRTE_PATH | sed -e 's/\/prte//'`"])])])
AS_IF([test "$setup_prrte_external_happy" = "yes"],
[$1], [$2])

Expand Down
6 changes: 6 additions & 0 deletions ompi/tools/mpirun/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,15 @@ mpirun_LDADD = \
install-exec-hook:
(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) mpirun$(EXEEXT) mpiexec$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f oshrun$(EXEEXT); $(LN_S) mpirun$(EXEEXT) oshrun$(EXEEXT))
if OMPI_EXTERNAL_PRRTE
(cd $(DESTDIR)$(bindir); rm -f prterun$(EXEEXT); $(LN_S) $(PRTE_PATH)/prterun prterun$(EXEEXT))
endif

uninstall-local:
rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
$(DESTDIR)$(bindir)/mpiexec$(EXEEXT) \
$(DESTDIR)$(bindir)/oshrun$(EXEEXT)
if OMPI_EXTERNAL_PRRTE
\ $(DESTDIR)$(bindir)/prterun$(EXEEXT)
endif
endif
12 changes: 12 additions & 0 deletions ompi/tools/mpirun/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ int main(int argc, char *argv[])
#endif
}

#if !OMPI_USING_INTERNAL_PRRTE
if(NULL == pfx) {
// In the external PRRTE case, a symlink
// should have been created placing prterun
// in bindir.
mca_base_framework_open(&opal_installdirs_base_framework, 0); // fill in the installdirs
if (NULL != opal_install_dirs.bindir) {
pfx = strdup(opal_install_dirs.bindir);
}
}
#endif

if (NULL == pfx) {
truepath = opal_path_findv("prterun", X_OK, environ, NULL);
} else {
Expand Down