Change defaults to prefer external libevent/hwloc #5395
+218
−162
Next
Next commit
hwloc: prefer external hwloc component
Signed-off-by: Gilles Gouaillardet <[email protected]> Signed-off-by: Jeff Squyres <[email protected]>
- Loading branch information
commit ce2c9fffd421036f46c3d35c1c85439d57538ca6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # -*- shell-script -*- | ||
| # | ||
| # Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved | ||
| # Copyright (c) 2014-2018 Research Organization for Information Science | ||
| # and Technology (RIST). All rights reserved. | ||
| # | ||
| # Copyright (c) 2018 Intel, Inc. All rights reserved. | ||
|
|
@@ -84,7 +84,7 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[ | |
| AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[ | ||
| AC_CONFIG_FILES([opal/mca/hwloc/external/Makefile]) | ||
|
|
||
| OPAL_VAR_SCOPE_PUSH([opal_hwloc_external_CPPFLAGS_save opal_hwloc_external_CFLAGS_save opal_hwloc_external_LDFLAGS_save opal_hwloc_external_LIBS_save opal_hwloc_external_tmp opal_hwloc_external_lstopo opal_hwloc_summary_msg]) | ||
|
|
||
| AC_ARG_WITH([hwloc-libdir], | ||
| [AC_HELP_STRING([--with-hwloc-libdir=DIR], | ||
|
|
@@ -98,19 +98,9 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[ | |
| AC_MSG_WARN([were specified, which does not make sense.]) | ||
| AC_MSG_ERROR([Cannot continue])]) | ||
|
|
||
| opal_hwloc_summary_msg="internal" | ||
| # Try external support if needed | ||
| AS_IF([test "$with_hwloc" != "internal"], | ||
| [OPAL_CHECK_WITHDIR([hwloc-libdir], [$with_hwloc_libdir], | ||
| [libhwloc.*]) | ||
|
|
||
|
|
@@ -144,64 +134,86 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[ | |
| LDFLAGS="$LDFLAGS $opal_hwloc_external_LDFLAGS" | ||
| LIBS="$LIBS $opal_hwloc_external_LIBS" | ||
| AC_CHECK_DECLS([HWLOC_OBJ_OSDEV_COPROC], [], [], [#include <hwloc.h>]) | ||
| AC_CHECK_FUNCS([hwloc_topology_dup]) | ||
|
|
||
| AC_MSG_CHECKING([if external hwloc version is 1.5 or greater]) | ||
| AC_COMPILE_IFELSE( | ||
| [AC_LANG_PROGRAM([[#include <hwloc.h>]], | ||
| [[ | ||
| #if HWLOC_API_VERSION < 0x00010500 | ||
| #error "hwloc API version is less than 0x00010500" | ||
| #endif | ||
| ]])], | ||
| [AC_MSG_RESULT([yes])], | ||
| [AC_MSG_RESULT([no]) | ||
| opal_hwloc_external_support=no])]) | ||
|
|
||
| # If external hwloc is not explicitly requested, check external version | ||
| # is not lower than the internal one | ||
| AS_IF([test "$opal_hwloc_external_support" = "yes"], | ||
| [AS_IF([test -z "$with_hwloc" || test "$with_hwloc" = "yes"], | ||
| [AC_MSG_CHECKING([if external hwloc version is 2.0 or greater]) | ||
| AC_COMPILE_IFELSE( | ||
| [AC_LANG_PROGRAM([[#include <hwloc.h>]], | ||
| [[ | ||
| #if HWLOC_API_VERSION < 0x00020000 | ||
| #error "hwloc API version is less than 0x00020000" | ||
|
Member
Author
There was a problem hiding this comment. Is there a way to have this version by reference instead of by value? I.e., I imagine that this will be one more place to forget to update if/when we update the embedded version of hwloc.
Contributor
There was a problem hiding this comment. I do not know ... strictly speaking, this is not even the library version (e.g. 2.0.1) but the API version (e.g. 2.0.0). @bgoglin is there any way to test the __library__version instead of the API version at compile time ?
Contributor
There was a problem hiding this comment. @ggouaillardet Don't you also need to test that
Contributor
There was a problem hiding this comment. @rhc54 you are right, and I just pushed a commit that fixes that. |
||
| #endif | ||
| ]])], | ||
| [AC_MSG_RESULT([yes])], | ||
| [AC_MSG_RESULT([no]) | ||
| opal_hwloc_summary_msg="internal (external hlwoc version is less than internal version 2.0)" | ||
| AC_MSG_WARN([external hwloc version is less than internal version 2.0]) | ||
| AC_MSG_WARN([using internal hwloc]) | ||
| opal_hwloc_external_support=no])])]) | ||
|
|
||
| AS_IF([test "$opal_hwloc_external_support" = "yes"], | ||
| [AC_DEFINE_UNQUOTED([HWLOC_EXTERNAL_HWLOC_VERSION], | ||
| [external], | ||
| [Version of hwloc]) | ||
|
|
||
| # See if the external hwloc supports XML | ||
| AC_MSG_CHECKING([if external hwloc supports XML]) | ||
| AS_IF([test "$opal_hwloc_dir" != ""], | ||
| [opal_hwloc_external_lstopo="$opal_hwloc_dir/bin/lstopo"], | ||
| [OPAL_WHICH(lstopo, opal_hwloc_external_lstopo)]) | ||
| opal_hwloc_external_tmp=`$opal_hwloc_external_lstopo --help | $GREP "Supported output file formats" | grep xml` | ||
| AS_IF([test "$opal_hwloc_external_tmp" = ""], | ||
| [opal_hwloc_external_enable_xml=0 | ||
| AC_MSG_RESULT([no])], | ||
| [opal_hwloc_external_enable_xml=1 | ||
| AC_MSG_RESULT([yes])]) | ||
|
|
||
| AC_CHECK_HEADERS([infiniband/verbs.h]) | ||
|
|
||
| # These flags need to get passed to the wrapper compilers | ||
| # (this is unnecessary for the internal/embedded hwloc) | ||
|
|
||
| # Finally, add some flags to the wrapper compiler if we're | ||
| # building with developer headers so that our headers can | ||
| # be found. | ||
| hwloc_external_WRAPPER_EXTRA_CPPFLAGS=$opal_hwloc_external_CPPFLAGS | ||
| hwloc_external_WRAPPER_EXTRA_LDFLAGS=$opal_hwloc_external_LDFLAGS | ||
| hwloc_external_WRAPPER_EXTRA_LIBS=$opal_hwloc_external_LIBS]) | ||
|
|
||
| CPPFLAGS=$opal_hwloc_external_CPPFLAGS_save | ||
| CFLAGS=$opal_hwloc_external_CFLAGS_save | ||
| LDFLAGS=$opal_hwloc_external_LDFLAGS_save | ||
| LIBS=$opal_hwloc_external_LIBS_save | ||
| ]) | ||
|
|
||
| # Done! | ||
| AS_IF([test "$opal_hwloc_external_support" = "yes"], | ||
| [opal_hwloc_summary_msg="external" | ||
| $1], | ||
| [# Abort is external hwloc was explicitly requested but cannot be built | ||
| AS_IF([test "$with_hwloc" != internal && | ||
| test -n "$with_hwloc"], | ||
| [AC_MSG_WARN([external hwloc cannot be built]) | ||
| AC_MSG_ERROR([Cannot continue.])]) | ||
| $2]) | ||
|
|
||
| OPAL_SUMMARY_ADD([[Miscellaneous]],[[HWLOC support]], [], [$opal_hwloc_summary_msg]) | ||
|
|
||
| AC_SUBST(opal_hwloc_external_LDFLAGS) | ||
| AC_SUBST(opal_hwloc_external_LIBS) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Per #5031, if external support is not available, we need to emit a message at the bottom of this configure.m4:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fixed in the latest commit