Skip to content
Snippets Groups Projects
Commit 2a4fe71a authored by Boris Karasev's avatar Boris Karasev Committed by Danny Auble
Browse files

Keep the original behavior for "srun --mpi=pmix" by creating a symlink

on the most recent pmix_vX.so file.
One is free to directly use new "pmix_vX" plugin names as well.

NOTE: there is one small artifact introduced by this fix - there will be
no "pmix" name in the output of "srun --mpi=list" but the most recent plugin
will be duplicated:

$ ./srun --mpi=list
srun: MPI types are...
srun: mpi/none
srun: mpi/mvapich
srun: mpi/mpich1_shmem
srun: mpi/mpichgm
srun: mpi/pmix_v1      <----
srun: mpi/mpichmx
srun: mpi/lam
srun: mpi/pmi2
srun: mpi/openmpi
srun: mpi/mpich1_p4
srun: mpi/pmix_v1      <----
parent 6e564433
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,23 @@ mpi_pmix_v2_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V2_CPPFLAGS) -DHAVE_PMIX_VER=2 ...@@ -41,6 +41,23 @@ mpi_pmix_v2_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V2_CPPFLAGS) -DHAVE_PMIX_VER=2
endif endif
if HAVE_PMIX_V2
mpi_pmix_so := mpi_pmix_v2.so
else
if HAVE_PMIX_V1
mpi_pmix_so := mpi_pmix_v1.so
endif
endif
force: force:
$(pmix_internal_libs): force $(pmix_internal_libs): force
@cd `dirname $@` && $(MAKE) `basename $@` @cd `dirname $@` && $(MAKE) `basename $@`
install-exec-hook:
rm -rf $(pkglibdir)/mpi_pmix.so
$(LN_S) ./$(mpi_pmix_so) $(pkglibdir)/mpi_pmix.so
uninstall-hook:
rm -rf $(pkglibdir)/mpi_pmix.so
...@@ -570,6 +570,8 @@ pmix_ldflags = $(SO_LDFLAGS) $(PLUGIN_FLAGS) ...@@ -570,6 +570,8 @@ pmix_ldflags = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_LIBADD = $(pmix_internal_libs) $(PMIX_LIBS) @HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_LIBADD = $(pmix_internal_libs) $(PMIX_LIBS)
@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V2_LDFLAGS) @HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V2_LDFLAGS)
@HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V2_CPPFLAGS) -DHAVE_PMIX_VER=2 @HAVE_PMIX_V2_TRUE@mpi_pmix_v2_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V2_CPPFLAGS) -DHAVE_PMIX_VER=2
@HAVE_PMIX_V1_TRUE@@HAVE_PMIX_V2_FALSE@mpi_pmix_so := mpi_pmix_v1.so
@HAVE_PMIX_V2_TRUE@mpi_pmix_so := mpi_pmix_v2.so
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
...@@ -1040,7 +1042,8 @@ install-dvi: install-dvi-am ...@@ -1040,7 +1042,8 @@ install-dvi: install-dvi-am
install-dvi-am: install-dvi-am:
install-exec-am: install-exec-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-am install-html: install-html-am
install-html-am: install-html-am:
...@@ -1081,8 +1084,9 @@ ps-am: ...@@ -1081,8 +1084,9 @@ ps-am:
uninstall-am: uninstall-pkglib_v1LTLIBRARIES \ uninstall-am: uninstall-pkglib_v1LTLIBRARIES \
uninstall-pkglib_v2LTLIBRARIES uninstall-pkglib_v2LTLIBRARIES
@$(NORMAL_INSTALL)
.MAKE: install-am install-strip $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: install-am install-exec-am install-strip uninstall-am
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
clean-libtool clean-pkglib_v1LTLIBRARIES \ clean-libtool clean-pkglib_v1LTLIBRARIES \
...@@ -1091,15 +1095,16 @@ uninstall-am: uninstall-pkglib_v1LTLIBRARIES \ ...@@ -1091,15 +1095,16 @@ uninstall-am: uninstall-pkglib_v1LTLIBRARIES \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \ html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \ install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \ install-exec-am install-exec-hook install-html install-html-am \
install-info-am install-man install-pdf install-pdf-am \ install-info install-info-am install-man install-pdf \
install-pkglib_v1LTLIBRARIES install-pkglib_v2LTLIBRARIES \ install-pdf-am install-pkglib_v1LTLIBRARIES \
install-ps install-ps-am install-strip installcheck \ install-pkglib_v2LTLIBRARIES install-ps install-ps-am \
installcheck-am installdirs maintainer-clean \ install-strip installcheck installcheck-am installdirs \
maintainer-clean-generic mostlyclean mostlyclean-compile \ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
tags tags-am uninstall uninstall-am \ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-pkglib_v1LTLIBRARIES uninstall-pkglib_v2LTLIBRARIES uninstall-hook uninstall-pkglib_v1LTLIBRARIES \
uninstall-pkglib_v2LTLIBRARIES
.PRECIOUS: Makefile .PRECIOUS: Makefile
...@@ -1108,6 +1113,13 @@ force: ...@@ -1108,6 +1113,13 @@ force:
$(pmix_internal_libs): force $(pmix_internal_libs): force
@cd `dirname $@` && $(MAKE) `basename $@` @cd `dirname $@` && $(MAKE) `basename $@`
install-exec-hook:
rm -rf $(pkglibdir)/mpi_pmix.so
$(LN_S) ./$(mpi_pmix_so) $(pkglibdir)/mpi_pmix.so
uninstall-hook:
rm -rf $(pkglibdir)/mpi_pmix.so
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment