Merge pull request #334 from insertinterestingnamehere/cmake

Clean Up Cmake Code For Finding Hwloc
sandialabs · Jan 22, 2025 · 75f7355 · 75f7355
2 parents b5cf46e + 708fbd3
commit 75f7355
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 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
@@ -9,6 +9,7 @@ set(QTHREADS_HASHMAP hashmap CACHE STRING "Which hashmap implementation to use.
 set(QTHREADS_DICT_TYPE shavit CACHE STRING "Which dictionary implementation to use. Valid values are \"shavit\", \"trie\", and \"simple\".")
 set(QTHREADS_TIMER_TYPE gettimeofday CACHE STRING "Which timer implementation to use. Valid values are \"clock_gettime\", \"mach\", \"gettimeofday\", and \"gethrtime\".")
 set(QTHREADS_CONTEXT_SWAP_IMPL fastcontext CACHE STRING "Which context swap implementation to use. Valid values are \"system\" and \"fastcontext\".")
+set(HWLOC_INSTALL_DIR /usr/local CACHE PATH "Install path for hwloc library")
 
 set(QTHREADS_SOURCES
   cacheline.c
@@ -75,10 +76,13 @@ target_include_directories(qthread
 set_target_properties(qthread PROPERTIES C_VISIBILITY_PRESET hidden)
 target_link_libraries(qthread PUBLIC Threads::Threads)
 if ("${QTHREADS_TOPOLOGY}" STREQUAL "hwloc" OR "${QTHREADS_TOPOLOGY}" STREQUAL "binders")
-  # TODO: pull this out into a simple module file so we can just do find_package instead.
-  find_library(HWLOC_LIBRARY NAMES hwloc PATH_SUFFIXES lib lib64)
+  find_path(HWLOC_INCLUDE_DIR NAMES hwloc.h HINTS ${HWLOC_INSTALL_DIR} PATH_SUFFIXES include)
+  target_include_directories(qthread PRIVATE ${HWLOC_INCLUDE_DIR})
+  find_library(HWLOC_LIBRARY
+    NAMES hwloc libhwloc
+    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() */

diff --git a/src/qthread.c b/src/qthread.c
@@ -1809,9 +1809,7 @@ void API_FUNC qthread_yield_(int k) { /*{{{ */
   }
 } /*}}} */
 
-void API_FUNC qthread_flushsc(void){
-  /*{{{*/
-} /*}}}*/
+void API_FUNC qthread_flushsc(void) {}
 
 /***********************************************
  * FORKING                                     *