Skip to content

minor hwloc configure fixes #7422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 27, 2020
Merged

minor hwloc configure fixes #7422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0621964
hwloc: remove unused xml configure-time check
bgoglin Feb 5, 2020
b5df92a
hwloc: remove a stale configure hack for hwloc 1.3.2 vs suse pci issues
bgoglin Feb 5, 2020
a0ea5ab
hwloc: clarify the error message when infiniband/verbs.h is missing b…
bgoglin Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions opal/mca/hwloc/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
# REQUIRE.
MCA_CONFIGURE_FRAMEWORK([opal], [hwloc], 1)

# Restore the --enable-pci flag
enable_pci=$opal_hwloc_hwloc132_save_enable_pci

# Give a blank line to separate these messages from the last
# component's configure.m4 output.
echo " "
Expand Down
12 changes: 0 additions & 12 deletions opal/mca/hwloc/external/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,6 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
AC_CHECK_DECLS([HWLOC_OBJ_OSDEV_COPROC], [], [], [#include <hwloc.h>])
AC_CHECK_FUNCS([hwloc_topology_dup])

# 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
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/hwloc/external/external.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ BEGIN_C_DECLS
# if defined(HAVE_INFINIBAND_VERBS_H)
# include MCA_hwloc_external_openfabrics_header
# else
# error Tried to include hwloc verbs helper file, but hwloc was compiled with no OpenFabrics support
# error Tried to include hwloc verbs helper file, but <infiniband/verbs.h> is missing
# endif
#endif

Expand Down
2 changes: 1 addition & 1 deletion opal/mca/hwloc/hwloc2/hwloc2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ BEGIN_C_DECLS
# if defined(HAVE_INFINIBAND_VERBS_H)
# include "hwloc/include/hwloc/openfabrics-verbs.h"
# else
# error Tried to include hwloc verbs helper file, but hwloc was compiled with no OpenFabrics support
# error Tried to include hwloc verbs helper file, but <infiniband/verbs.h> is missing
# endif
#endif

Expand Down