Hi Jeff, Why did you delete the il
libmca_common_alps_so_version thats going to break my stuff. 2014-12-17 14:36 GMT-07:00 <git...@crest.iu.edu>: > > This is an automated email from the git hooks/post-receive script. It was > generated because a ref change was pushed to the repository containing > the project "open-mpi/ompi". > > The branch, master has been updated > via 6c468b8691708fcc7c130a389804d98f26b1e783 (commit) > via f1a5d3a90df09b4f8749555936d71bae75477a45 (commit) > via d6f059f53870bae6082ad408d6c0760c795ecb9b (commit) > via 4dcb92ab0b7c8b8a76f0a606d39d3ca529831930 (commit) > via 6edc19d78db25eb31774a42e282abab496550071 (commit) > from f55de452abdeeaa282205b21f6183e3e09cfdeba (commit) > > Those revisions listed above that are new to this repository have > not appeared on any other notification email; so we list those > revisions in full, below. > > - Log ----------------------------------------------------------------- > > https://github.com/open-mpi/ompi/commit/6c468b8691708fcc7c130a389804d98f26b1e783 > > commit 6c468b8691708fcc7c130a389804d98f26b1e783 > Author: Jeff Squyres <jsquy...@cisco.com> > Date: Wed Dec 17 13:29:02 2014 -0800 > > configury: remove unused shared library version numbers > > These components do not exist any more, so remove their shared library > version numbers. > > diff --git a/VERSION b/VERSION > index 526ee11..14043e8 100644 > --- a/VERSION > +++ b/VERSION > @@ -100,14 +100,12 @@ liboshmem_java_so_version=0:0:0 > > # OMPI layer > libmca_common_cuda_so_version=0:0:0 > -libmca_common_mx_so_version=0:0:0 > libmca_common_ofacm_so_version=0:0:0 > libmca_common_sm_so_version=0:0:0 > libmca_common_ugni_so_version=0:0:0 > libmca_common_verbs_so_version=0:0:0 > > # OPAL layer > -libmca_opal_common_pmi_so_version=0:0:0 > libmca_opal_common_libfabric_so_version=0:0:0 > > # ORTE layer > diff --git a/configure.ac b/configure.ac > index dafde80..a393e2f 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -132,13 +132,7 @@ m4_ifdef([project_ompi], > AC_SUBST(libmpi_usempi_tkr_so_version) > AC_SUBST(libmpi_usempi_ignore_tkr_so_version) > AC_SUBST(libmpi_usempif08_so_version) > - AC_SUBST(libmpi_java_so_version) > - # It's icky that we have to hard-code the names of the > - # common components here. :-( This could probably be done > - # transparently by adding some intelligence in autogen.pl > - # and/or opal_mca.m4, but I don't have the cycles to do this > - # right now. > - AC_SUBST(libmca_common_mx_so_version)]) > + AC_SUBST(libmpi_java_so_version)]) > m4_ifdef([project_orte], > [AC_SUBST(libopen_rte_so_version)]) > m4_ifdef([project_oshmem], > @@ -150,15 +144,12 @@ AC_SUBST(libopen_pal_so_version) > # transparently by adding some intelligence in autogen.pl > # and/or opal_mca.m4, but I don't have the cycles to do this > # right now. > -AC_SUBST(libmca_opal_common_hwloc_so_version) > -AC_SUBST(libmca_opal_common_pmi_so_version) > AC_SUBST(libmca_opal_common_libfabric_so_version) > AC_SUBST(libmca_common_cuda_so_version) > AC_SUBST(libmca_common_ofacm_so_version) > AC_SUBST(libmca_common_sm_so_version) > AC_SUBST(libmca_common_ugni_so_version) > AC_SUBST(libmca_common_verbs_so_version) > -AC_SUBST(libmca_common_alps_so_version) > > # > # Get the versions of the autotools that were used to bootstrap us > > > > https://github.com/open-mpi/ompi/commit/f1a5d3a90df09b4f8749555936d71bae75477a45 > > commit f1a5d3a90df09b4f8749555936d71bae75477a45 > Author: Jeff Squyres <jsquy...@cisco.com> > Date: Wed Dec 17 13:22:51 2014 -0800 > > configury: propagate a libtool shared lib version for libfabric > > diff --git a/VERSION b/VERSION > index 232938a..526ee11 100644 > --- a/VERSION > +++ b/VERSION > @@ -108,6 +108,7 @@ libmca_common_verbs_so_version=0:0:0 > > # OPAL layer > libmca_opal_common_pmi_so_version=0:0:0 > +libmca_opal_common_libfabric_so_version=0:0:0 > > # ORTE layer > libmca_common_alps_so_version=0:0:0 > diff --git a/configure.ac b/configure.ac > index 3d8b3a2..dafde80 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -152,6 +152,7 @@ AC_SUBST(libopen_pal_so_version) > # right now. > AC_SUBST(libmca_opal_common_hwloc_so_version) > AC_SUBST(libmca_opal_common_pmi_so_version) > +AC_SUBST(libmca_opal_common_libfabric_so_version) > AC_SUBST(libmca_common_cuda_so_version) > AC_SUBST(libmca_common_ofacm_so_version) > AC_SUBST(libmca_common_sm_so_version) > diff --git a/opal/mca/common/libfabric/Makefile.am > b/opal/mca/common/libfabric/Makefile.am > index bd5754e..57bc821 100644 > --- a/opal/mca/common/libfabric/Makefile.am > +++ b/opal/mca/common/libfabric/Makefile.am > @@ -196,7 +196,8 @@ endif OPAL_COMMON_LIBFABRIC_HAVE_PROVIDER_PSM > > lib@OPAL_LIB_PREFIX@mca_common_libfabric_la_SOURCES = $(headers) > $(sources) > lib@OPAL_LIB_PREFIX@mca_common_libfabric_la_CPPFLAGS = $(cppflags) > -lib@OPAL_LIB_PREFIX@mca_common_libfabric_la_LDFLAGS = -version-info 0:0:0 > +lib@OPAL_LIB_PREFIX@mca_common_libfabric_la_LDFLAGS = \ > + -version-info $(libmca_opal_common_libfabric_so_version) > lib@OPAL_LIB_PREFIX@mca_common_libfabric_la_LIBADD = $(libadd) > > lib@OPAL_LIB_PREFIX@mca_common_libfabric_noinst_la_SOURCES = $(headers) > $(sources) > > > > https://github.com/open-mpi/ompi/commit/d6f059f53870bae6082ad408d6c0760c795ecb9b > > commit d6f059f53870bae6082ad408d6c0760c795ecb9b > Author: Jeff Squyres <jsquy...@cisco.com> > Date: Wed Dec 17 13:11:10 2014 -0800 > > configury: add some descriptive output messages in configure > > Ensure that the ofi MTL and the usnic BTL have good descriptive output > messages in configure. > > diff --git a/ompi/mca/mtl/ofi/configure.m4 b/ompi/mca/mtl/ofi/configure.m4 > index a3e6816..79df62d 100644 > --- a/ompi/mca/mtl/ofi/configure.m4 > +++ b/ompi/mca/mtl/ofi/configure.m4 > @@ -2,6 +2,7 @@ > # > # Copyright (c) 2013-2014 Intel, Inc. All rights reserved > # > +# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. > # $COPYRIGHT$ > # > # Additional copyrights may follow > @@ -22,11 +23,10 @@ AC_DEFUN([MCA_ompi_mtl_ofi_POST_CONFIG], [ > AC_DEFUN([MCA_ompi_mtl_ofi_CONFIG],[ > AC_CONFIG_FILES([ompi/mca/mtl/ofi/Makefile]) > > + AC_MSG_CHECKING([for libfabric support]) > AS_IF([test $opal_common_libfabric_happy -eq 1], > - [$1], > - [$2]) > - > - # substitute in the things needed to build ofi > - AC_SUBST([opal_common_libfabric_CPPFLAGS]) > - AC_SUBST([opal_common_libfabric_LIBADD]) > + [AC_MSG_RESULT([yes]) > + $1], > + [AC_MSG_RESULT([no]) > + $2]) > ])dnl > diff --git a/opal/mca/btl/usnic/configure.m4 > b/opal/mca/btl/usnic/configure.m4 > index d6bf6af..861d89f 100644 > --- a/opal/mca/btl/usnic/configure.m4 > +++ b/opal/mca/btl/usnic/configure.m4 > @@ -98,7 +98,7 @@ AC_DEFUN([_OPAL_BTL_USNIC_DO_CONFIG],[ > # (the common/ configury is guaranteed to come first). So we can > # simply check to see if libfabric setup was happy. > AS_IF([test "$btl_usnic_happy" = "yes"], > - [AC_MSG_CHECKING([if building embedded libfabric]) > + [AC_MSG_CHECKING([if building embedded libfabric with usnic > provider]) > AS_IF([test $opal_common_libfabric_happy -eq 1 && \ > test $opal_common_libfabric_usnic_happy -eq 1 && \ > test $opal_common_libfabric_build_embedded -eq 1], > > > > https://github.com/open-mpi/ompi/commit/4dcb92ab0b7c8b8a76f0a606d39d3ca529831930 > > commit 4dcb92ab0b7c8b8a76f0a606d39d3ca529831930 > Author: Jeff Squyres <jsquy...@cisco.com> > Date: Wed Dec 17 13:10:51 2014 -0800 > > ofi: remove use of non-existent macros > > diff --git a/ompi/mca/mtl/ofi/Makefile.am b/ompi/mca/mtl/ofi/Makefile.am > index 4db0fde..5be7079 100644 > --- a/ompi/mca/mtl/ofi/Makefile.am > +++ b/ompi/mca/mtl/ofi/Makefile.am > @@ -1,6 +1,7 @@ > # > # Copyright (c) 2013-2014 Intel, Inc. All rights reserved > # > +# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. > # $COPYRIGHT$ > # > # Additional copyrights may follow > @@ -45,9 +46,9 @@ mcacomponentdir = $(ompilibdir) > mcacomponent_LTLIBRARIES = $(component_install) > mca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources) > mca_mtl_ofi_la_LIBADD = $(opal_common_libfabric_LIBADD) > -mca_mtl_ofi_la_LDFLAGS = -module -avoid-version $(mtl_ofi_LDFLAGS) > +mca_mtl_ofi_la_LDFLAGS = -module -avoid-version > > noinst_LTLIBRARIES = $(component_noinst) > libmca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources) > libmca_mtl_ofi_la_LIBADD = $(opal_common_libfabric_LIBADD) > -libmca_mtl_ofi_la_LDFLAGS = -module -avoid-version $(mtl_ofi_LDFLAGS) > +libmca_mtl_ofi_la_LDFLAGS = -module -avoid-version > > > > https://github.com/open-mpi/ompi/commit/6edc19d78db25eb31774a42e282abab496550071 > > commit 6edc19d78db25eb31774a42e282abab496550071 > Author: Jeff Squyres <jsquy...@cisco.com> > Date: Wed Dec 17 13:09:44 2014 -0800 > > libfabric: ensure that shell variables are initialized > > Ensure that the <provider>_happy shell variables are initialized to > 0. Without this, the --without-libfabric case would leave them > initialized, resulting in "test: -eq operator expecting a value" kinds > of errors. > > diff --git a/opal/mca/common/libfabric/configure.m4 > b/opal/mca/common/libfabric/configure.m4 > index 28e4b13..e024af2 100644 > --- a/opal/mca/common/libfabric/configure.m4 > +++ b/opal/mca/common/libfabric/configure.m4 > @@ -22,6 +22,8 @@ AC_DEFUN([MCA_opal_common_libfabric_CONFIG],[ > # Initially state that we're unhappy > opal_common_libfabric_happy=0 > opal_common_libfabric_build_embedded=0 > + _OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC_SETUP > + _OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_PSM_SETUP > > # Setup the --with switches to allow users to specify where > # libfabric stuff lives. > @@ -263,6 +265,13 @@ AC_DEFUN([_OPAL_COMMON_LIBFABRIC_CHECK_INCDIR],[ > ]) > > # -------------------------------------------------------- > +# Internal helper macro to setup the embedded usnic provider > +# -------------------------------------------------------- > +AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC_SETUP],[ > + opal_common_libfabric_usnic_happy=0 > +]) > + > +# -------------------------------------------------------- > # Internal helper macro to look for the things the usnic provider > # needs > # -------------------------------------------------------- > @@ -292,6 +301,13 @@ > AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC_CONDITIONALS],[ > ]) > > # -------------------------------------------------------- > +# Internal helper macro to setup the embedded PSM provider > +# -------------------------------------------------------- > +AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_PSM_SETUP],[ > + opal_common_libfabric_psm_happy=0 > +]) > + > +# -------------------------------------------------------- > # Internal helper macro to look for the things the psm provider > # needs > # -------------------------------------------------------- > > > ----------------------------------------------------------------------- > > Summary of changes: > VERSION | 3 +-- > configure.ac | 12 ++---------- > ompi/mca/mtl/ofi/Makefile.am | 5 +++-- > ompi/mca/mtl/ofi/configure.m4 | 12 ++++++------ > opal/mca/btl/usnic/configure.m4 | 2 +- > opal/mca/common/libfabric/Makefile.am | 3 ++- > opal/mca/common/libfabric/configure.m4 | 16 ++++++++++++++++ > 7 files changed, 31 insertions(+), 22 deletions(-) > > > hooks/post-receive > -- > open-mpi/ompi > _______________________________________________ > ompi-commits mailing list > ompi-comm...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/ompi-commits >
