Yes, it did, because Howard's commit was wrong. I'm not sure what the exact problem was he was fixing (the commit message wasn't very specific), but the shell variable names were already correct -- they are to indicate whether a specific provider (usnic, in this case) can be built; not the libfabric core.
However, there was a problem where provider libs were being unconditionally added; this *may* have been Howard's problem...? I just pushed a fix for that: https://github.com/open-mpi/ompi/commit/c40fd09d2a0575e493137158644fd2b610a48aca Howard's here at the Forum with me; I'll consult with him in person later this morning. On Dec 9, 2014, at 7:15 AM, Ralph Castain <r...@open-mpi.org> wrote: > I believe this just reverted a commit last night from Howard that he needed > to fix the build on the Cray. > > >> On Dec 9, 2014, at 5:52 AM, git...@crest.iu.edu wrote: >> >> 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 09d03a154bcb5ba1fae45895a20c7d4ffb9846ab (commit) >> from 18d9fdfd8ddd9e778ea1193a9f44a0b0423b7a76 (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/09d03a154bcb5ba1fae45895a20c7d4ffb9846ab >> >> commit 09d03a154bcb5ba1fae45895a20c7d4ffb9846ab >> Author: Jeff Squyres <jsquy...@cisco.com> >> Date: Tue Dec 9 05:52:24 2014 -0800 >> >> libfabric: fix some typos in the usnic configury >> >> diff --git a/opal/mca/common/libfabric/configure.m4 >> b/opal/mca/common/libfabric/configure.m4 >> index a255fc3..26b39e1 100644 >> --- a/opal/mca/common/libfabric/configure.m4 >> +++ b/opal/mca/common/libfabric/configure.m4 >> @@ -267,12 +267,12 @@ AC_DEFUN([_OPAL_COMMON_LIBFABRIC_CHECK_INCDIR],[ >> AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC],[ >> opal_common_libfabric_usnic_happy=1 >> AC_CHECK_HEADER([linux/netlink.h], [], >> - [opal_common_libfabric_happy=0], [ >> + [opal_common_libfabric_usnic_happy=0], [ >> #include <sys/types.h> >> #include <net/if.h> >> ]) >> AC_CHECK_LIB([nl], [nl_connect], [], >> - [opal_common_libfabric_happy=0]) >> + [opal_common_libfabric_usnic_happy=0]) >> >> opal_common_libfabric_CPPFLAGS="$opal_common_libfabric_CPPFLAGS >> -I$OPAL_TOP_SRCDIR/opal/mca/common/libfabric/libfabric/prov/usnic/src >> -I$OPAL_TOP_SRCDIR/opal/mca/common/libfabric/libfabric/prov/usnic/src/usnic_direct" >> >> opal_common_libfabric_LIBADD="\$(OPAL_TOP_BUILDDIR)/opal/mca/common/libfabric/lib${OPAL_LIB_PREFIX}mca_common_libfabric.la" >> @@ -286,5 +286,5 @@ >> AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC],[ >> # -------------------------------------------------------- >> AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC_CONDITIONALS],[ >> AM_CONDITIONAL([OPAL_COMMON_LIBFABRIC_HAVE_PROVIDER_USNIC], >> - [test $opal_common_libfabric_happy -eq 1]) >> + [test $opal_common_libfabric_usnic_happy -eq 1]) >> ]) >> >> >> ----------------------------------------------------------------------- >> >> Summary of changes: >> opal/mca/common/libfabric/configure.m4 | 6 +++--- >> 1 file changed, 3 insertions(+), 3 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 > > _______________________________________________ > devel mailing list > de...@open-mpi.org > Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel > Link to this post: > http://www.open-mpi.org/community/lists/devel/2014/12/16469.php -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
