Merge pull request #4356 from jsquyres/pr/v2.x/dont-allow-hwloc-external-ge-2-0

v2.x: hwloc/external: abort if hwloc v2 is detected since it is not yet sup…

Author: jsquyres

README

@@ -1078,6 +1078,10 @@ MISCELLANEOUS SUPPORT LIBRARIES
   to include Open MPI and use their default hwloc installation instead
   of Open MPI's bundled hwloc.
 
+  Note that this version of Open MPI does not support hwloc >= v2.0.
+  If hwloc v2.0.x support is needed, Open MPI v3.1.x (and later) can
+  be used.
+
   hwloc is a support library that provides processor and memory
   affinity information for NUMA platforms.
 

opal/mca/hwloc/external/configure.m4

@@ -176,6 +176,22 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
                [AC_MSG_RESULT([yes])],
                [AC_MSG_RESULT([no])
                 AC_MSG_ERROR([Cannot continue])])
+           AC_MSG_CHECKING([if external hwloc version is lower than 2.0])
+           AS_IF([test "$opal_hwloc_dir" != ""],
+                 [opal_hwloc_external_CFLAGS_save=$CFLAGS
+                  CFLAGS="-I$opal_hwloc_dir/include $opal_hwloc_external_CFLAGS_save"])
+           AC_COMPILE_IFELSE(
+               [AC_LANG_PROGRAM([[#include <hwloc.h>]],
+                   [[
+#if HWLOC_API_VERSION >= 0x00020000
+#error "hwloc API version is greater or equal than 0x00020000"
+#endif
+                   ]])],
+               [AC_MSG_RESULT([yes])],
+               [AC_MSG_RESULT([no])
+                AC_MSG_ERROR([The Open MPI v2.1.x series does not support hwloc >= v2.0.
+Open MPI v3.1.0 and later support hwloc >= v2.0.
+Cannot continue])])
            AS_IF([test "$opal_hwloc_dir" != ""],
                  [CFLAGS=$opal_hwloc_external_CFLAGS_save])