Merge pull request open-mpi#938 from jsquyres/pr/v1.10/dont-build-verbs-usnic-by-default

v1.10: verbs_usnic: do not build by default

Author: rhc54

README

@@ -8,7 +8,7 @@ Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
                         University of Stuttgart.  All rights reserved.
 Copyright (c) 2004-2007 The Regents of the University of California.
                         All rights reserved.
-Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 Copyright (c) 2006-2011 Mellanox Technologies. All rights reserved.
 Copyright (c) 2006-2012 Oracle and/or its affiliates.  All rights reserved.
 Copyright (c) 2007      Myricom, Inc.  All rights reserved.
@@ -958,6 +958,20 @@ NETWORKING SUPPORT / OPTIONS
   directory>/lib64, which covers most cases.  This option is only
   needed for special configurations.
 
+--with-verbs-usnic
+  This option will activate support in Open MPI for disabling a
+  dire-sounding warning message from libibverbs that Cisco usNIC
+  devices are not supported (because Cisco usNIC devices are supported
+  through libfabric, not libibverbs).  This libibverbs warning can
+  also be suppressed by installing the "no op" libusnic_verbs plugin
+  for libibverbs (see https://github.com/cisco/libusnic_verbs, or
+  download binaries from cisco.com).  This option is disabled by
+  default because it causes libopen-pal.so to depend on libibverbs.so,
+  which is undesirable to many downstream packagers.
+
+--with-usnic
+  Abort configure if Cisco usNIC support cannot be built.
+
 RUN-TIME SYSTEM SUPPORT
 
 --enable-mpirun-prefix-by-default

ompi/mca/common/verbs/common_verbs_basics.c

@@ -21,7 +21,9 @@
 #include <unistd.h>
 #endif
 
+#if OPAL_COMMON_VERBS_USNIC_HAPPY
 #include "ompi/mca/common/verbs_usnic/common_verbs_usnic.h"
+#endif
 
 /* This is crummy, but <infiniband/driver.h> doesn't work on all
    platforms with all compilers.  Specifically, trying to include it
@@ -93,12 +95,14 @@ int opal_common_verbs_fork_test(void)
     }
 #endif
 
+#if OPAL_COMMON_VERBS_USNIC_HAPPY
     /* Now register any necessary fake libibverbs drivers.  We
        piggyback loading these fake drivers on the fork test because
        they must be loaded before ibv_get_device_list() is invoked.
        Note that this routine is in a different common component (see
        comments over there for an explanation why).  */
     ompi_common_verbs_usnic_register_fake_drivers();
+#endif
 
     return ret;
 }

ompi/mca/common/verbs_usnic/configure.m4

@@ -38,12 +38,26 @@ AC_DEFUN([MCA_ompi_common_verbs_usnic_COMPILE_MODE], [
 # ------------------------------------------------
 AC_DEFUN([MCA_ompi_common_verbs_usnic_CONFIG],[
     AC_CONFIG_FILES([ompi/mca/common/verbs_usnic/Makefile])
-    common_verbs_usnic_happy="no"
+    common_verbs_usnic_happy=0
 
-    OMPI_CHECK_OPENFABRICS([common_verbs_usnic],
-                           [common_verbs_usnic_happy="yes"])
+    AC_ARG_WITH(verbs-usnic,
+                AC_HELP_STRING([--with-verbs-usnic],
+                               [Add support in Open MPI to defeat a seemingly dire warning message from libibverbs that Cisco usNIC devices are not supported.  This support is not compiled by default because you can also avoid this libibverbs bug by installing the libibverbs_usnic "no no" plugin, available from https://github.com/cisco/libusnic_verbs or in binary form from cisco.com]))
 
-    AS_IF([test "$common_verbs_usnic_happy" = "yes"],
+    AS_IF([test "$with_verbs_usnic" = "yes"],
+          [common_verbs_usnic_happy=1])
+
+    AS_IF([test $common_verbs_usnic_happy -eq 1],
+          [OMPI_CHECK_OPENFABRICS([common_verbs_usnic],
+                                  [common_verbs_usnic_happy=1],
+                                  [common_verbs_usnic_happy=0])
+          ])
+
+    AC_DEFINE_UNQUOTED([OPAL_COMMON_VERBS_USNIC_HAPPY],
+                       [$common_verbs_usnic_happy],
+                       [Whether the common/usnic_verbs component is being built or not])
+
+    AS_IF([test $common_verbs_usnic_happy -eq 1],
           [$1],
           [$2])