Update

Author: kingcrimsontianyu

cpp/benchmarks/CMakeLists.txt

@@ -43,8 +43,10 @@ function(kvikio_add_benchmark)
 
   add_executable(${_KVIKIO_NAME} ${_KVIKIO_SOURCES})
   set_target_properties(${_KVIKIO_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib")
-  target_include_directories(${_KVIKIO_NAME} PRIVATE ../include ${cuFile_INCLUDE_DIRS})
-  target_link_libraries(${_KVIKIO_NAME} PUBLIC benchmark::benchmark kvikio)
+
+  get_target_property(KVIKIO_INCLUDES kvikio::kvikio INCLUDE_DIRECTORIES)
+  target_include_directories(${_KVIKIO_NAME} PRIVATE "${KVIKIO_INCLUDES}")
+  target_link_libraries(${_KVIKIO_NAME} PUBLIC benchmark::benchmark kvikio::kvikio)
 
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(KVIKIO_CXX_FLAGS "-Wall;-Werror;-Wno-unknown-pragmas")

cpp/benchmarks/threadpool/threadpool_benchmark.cpp

@@ -21,7 +21,8 @@
 #include <benchmark/benchmark.h>
 #include <kvikio/defaults.hpp>
 
-enum ScalingType : int64_t {
+namespace kvikio {
+enum class ScalingType : uint8_t {
   StrongScaling,
   WeakScaling,
 };
@@ -35,21 +36,19 @@ void task_compute(std::size_t num_compute_iterations)
   }
 }
 
+template <ScalingType scaling_type>
 void BM_threadpool_compute(benchmark::State& state)
 {
-  auto num_threads        = state.range(0);
-  auto compute_bench_type = state.range(1);
+  auto num_threads = state.range(0);
 
   std::string label;
   std::size_t num_compute_tasks;
-  if (compute_bench_type == ScalingType::StrongScaling) {
+  if constexpr (scaling_type == ScalingType::StrongScaling) {
     num_compute_tasks = 1'0000;
-    label             = "strong_scaling";
   } else {
     num_compute_tasks = 1000 * num_threads;
-    label             = "weak_scaling";
   }
-  state.SetLabel(label);
+
   std::size_t const num_compute_iterations{100'000};
   kvikio::defaults::set_thread_pool_nthreads(num_threads);
 
@@ -65,17 +64,22 @@ void BM_threadpool_compute(benchmark::State& state)
 
   state.counters["threads"] = num_threads;
 }
+}  // namespace kvikio
 
 int main(int argc, char** argv)
 {
   benchmark::Initialize(&argc, argv);
 
-  benchmark::RegisterBenchmark("BM_threadpool_compute:strong_scaling", BM_threadpool_compute)
-    ->ArgsProduct({{1, 2, 4, 8, 16, 32, 64}, {ScalingType::StrongScaling}})
+  benchmark::RegisterBenchmark("BM_threadpool_compute:strong_scaling",
+                               kvikio::BM_threadpool_compute<kvikio::ScalingType::StrongScaling>)
+    ->RangeMultiplier(2)
+    ->Range(1, 64)
     ->Unit(benchmark::kMillisecond);
 
-  benchmark::RegisterBenchmark("BM_threadpool_compute:weak_scaling", BM_threadpool_compute)
-    ->ArgsProduct({{1, 2, 4, 8, 16, 32, 64}, {ScalingType::WeakScaling}})
+  benchmark::RegisterBenchmark("BM_threadpool_compute:weak_scaling",
+                               kvikio::BM_threadpool_compute<kvikio::ScalingType::WeakScaling>)
+    ->RangeMultiplier(2)
+    ->Range(1, 64)
     ->Unit(benchmark::kMillisecond);
 
   benchmark::RunSpecifiedBenchmarks();

cpp/examples/CMakeLists.txt

@@ -13,14 +13,15 @@
 # =============================================================================
 
 set(TEST_INSTALL_PATH bin/tests/libkvikio)
+get_target_property(KVIKIO_INCLUDES kvikio::kvikio INCLUDE_DIRECTORIES)
 
 # Example: basic_io
 
 if(CUDAToolkit_FOUND)
   add_executable(BASIC_IO_EXAMPLE basic_io.cpp)
   set_target_properties(BASIC_IO_EXAMPLE PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib")
-  target_include_directories(BASIC_IO_EXAMPLE PRIVATE ../include ${cuFile_INCLUDE_DIRS})
-  target_link_libraries(BASIC_IO_EXAMPLE PRIVATE kvikio CUDA::cudart)
+  target_include_directories(BASIC_IO_EXAMPLE PRIVATE "${KVIKIO_INCLUDES}")
+  target_link_libraries(BASIC_IO_EXAMPLE PRIVATE kvikio::kvikio CUDA::cudart)
 
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(KVIKIO_CXX_FLAGS "-Wall;-Werror;-Wno-unknown-pragmas")
@@ -43,8 +44,8 @@ endif()
 
 add_executable(BASIC_NO_CUDA_EXAMPLE basic_no_cuda.cpp)
 set_target_properties(BASIC_NO_CUDA_EXAMPLE PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib")
-target_include_directories(BASIC_NO_CUDA_EXAMPLE PRIVATE ../include)
-target_link_libraries(BASIC_NO_CUDA_EXAMPLE PRIVATE kvikio)
+target_include_directories(BASIC_NO_CUDA_EXAMPLE PRIVATE "${KVIKIO_INCLUDES}")
+target_link_libraries(BASIC_NO_CUDA_EXAMPLE PRIVATE kvikio::kvikio)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   set(KVIKIO_CXX_FLAGS "-Wall;-Werror;-Wno-unknown-pragmas")