Require hwloc 2 or later. Also get rid of a useless compile-time flag.

sandialabs · Jan 21, 2025 · 2bd7d57 · 2bd7d57
1 parent b572ba0
commit 2bd7d57
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/include/qthread_innards.h b/include/qthread_innards.h
@@ -6,13 +6,6 @@
 
 #include <pthread.h>
 
-#ifdef USE_HWLOC
-#include <hwloc.h>
-#if (HWLOC_API_VERSION < 0x00010000)
-#error HWLOC version unrecognized
-#endif
-#endif
-
 /* Internal Headers */
 #include "qt_asserts.h"
 #include "qt_atomics.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -83,7 +83,6 @@ if ("${QTHREADS_TOPOLOGY}" STREQUAL "hwloc" OR "${QTHREADS_TOPOLOGY}" STREQUAL "
     HINTS ${HWLOC_INSTALL_DIR}
     PATH_SUFFIXES lib lib64 lib32)
   target_link_libraries(qthread PUBLIC "${HWLOC_LIBRARY}")
-  target_compile_definitions(qthread PRIVATE USE_HWLOC)
   if ("${QTHREADS_TOPOLOGY}" STREQUAL "hwloc")
     target_compile_definitions(qthread PRIVATE USE_HWLOC_MEM_AFFINITY)
   endif()

diff --git a/src/affinity/binders.c b/src/affinity/binders.c
@@ -2,6 +2,10 @@
 
 #include <hwloc.h>
 
+#if (HWLOC_API_VERSION < 0x00020000)
+#error HWLOC version unrecognized
+#endif
+
 #include "qt_affinity.h"
 #include "qt_alloc.h"
 #include "qt_envariables.h"

diff --git a/src/affinity/hwloc.c b/src/affinity/hwloc.c
@@ -1,5 +1,9 @@
 #include <hwloc.h>
 
+#if (HWLOC_API_VERSION < 0x00020000)
+#error HWLOC version unrecognized
+#endif
+
 #include "qt_affinity.h"
 #include "qt_alloc.h"
 #include "qt_asserts.h" /* for qassert() */