From 0ee8295e6e49877f9cdb6a90916ce60ece1617c7 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 31 Jul 2015 11:39:47 -0700 Subject: [PATCH 1/2] usnic: ensure that we have libfabric >= v1.1 --- opal/mca/btl/usnic/configure.m4 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/opal/mca/btl/usnic/configure.m4 b/opal/mca/btl/usnic/configure.m4 index 78133eca27..d74143040c 100644 --- a/opal/mca/btl/usnic/configure.m4 +++ b/opal/mca/btl/usnic/configure.m4 @@ -102,6 +102,26 @@ AC_DEFUN([_OPAL_BTL_USNIC_DO_CONFIG],[ AC_MSG_RESULT([$opal_btl_usnic_happy]) ]) + # The usnic BTL requires at least libfabric v1.1 (there was a + # critical bug in libfabric v1.0). + AS_IF([test "$opal_btl_usnic_happy" = "yes"], + [AC_MSG_CHECKING([whether libfabric is >= v1.1]) + opal_btl_usnic_CPPFLAGS_save=$CPPFLAGS + CPPFLAGS="$opal_common_libfabric_CPPFLAGS $CPPFLAGS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +[[ +#if !defined(FI_MAJOR_VERSION) +#error your version of libfabric is too old +#elif FI_VERSION(FI_MAJOR_VERSION, FI_MINOR_VERSION) < FI_VERSION(1, 1) +#error your version of libfabric is too old +#endif +]])], + [opal_btl_usnic_happy=yes], + [opal_btl_usnic_happy=no]) + AC_MSG_RESULT([$opal_btl_usnic_happy]) + CPPFLAGS=$opal_btl_usnic_CPPFLAGS_save + ]) + # Make sure we can find the libfabric usnic extensions header AS_IF([test "$opal_btl_usnic_happy" = "yes" ], [opal_btl_usnic_CPPFLAGS_save=$CPPFLAGS From cbcd16b399cfc7ca1cc043c0c107cbee55c93cb9 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 31 Jul 2015 11:40:03 -0700 Subject: [PATCH 2/2] usnic: remove a stale shell variable name --- opal/mca/btl/usnic/configure.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opal/mca/btl/usnic/configure.m4 b/opal/mca/btl/usnic/configure.m4 index d74143040c..406a8ffa06 100644 --- a/opal/mca/btl/usnic/configure.m4 +++ b/opal/mca/btl/usnic/configure.m4 @@ -47,7 +47,7 @@ AC_DEFUN([MCA_opal_btl_usnic_CONFIG],[ ]) AC_DEFUN([_OPAL_BTL_USNIC_DO_CONFIG],[ - OPAL_VAR_SCOPE_PUSH([unit_tests opal_btl_usnic_CPPFLAGS_save]) + OPAL_VAR_SCOPE_PUSH([unit_tests]) # see README.test for information about this scheme AC_ARG_ENABLE([opal-btl-usnic-unit-tests],