Fix errors during rebase

rapidsai · Feb 21, 2025 · 7671099 · 7671099
1 parent 359c19a
commit 7671099
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/cpp/include/kvikio/defaults.hpp b/cpp/include/kvikio/defaults.hpp
@@ -59,7 +59,7 @@ CompatMode getenv_or(std::string_view env_var_name, CompatMode default_val);
  */
 class defaults {
  private:
-  BS::thread_pool _thread_pool{get_num_threads_from_env()};
+  BS_thread_pool _thread_pool{get_num_threads_from_env()};
   CompatMode _compat_mode;
   std::size_t _task_size;
   std::size_t _gds_threshold;
@@ -155,7 +155,7 @@ class defaults {
    *
    * @return The the default thread pool instance.
    */
-  [[nodiscard]] static BS::thread_pool& thread_pool();
+  [[nodiscard]] static BS_thread_pool& thread_pool();
 
   /**
    * @brief Get the number of threads in the default thread pool.

diff --git a/cpp/include/kvikio/parallel_operation.hpp b/cpp/include/kvikio/parallel_operation.hpp
@@ -113,7 +113,7 @@ template <typename F>
 std::future<std::size_t> submit_move_only_task(
   F op_move_only,
   std::uint64_t nvtx_payload = 0ull,
-  nvtx_color_type nvtx_color = nvtx_manager::default_color())
+  nvtx_color_type nvtx_color = NvtxManager::default_color())
 {
   static_assert(std::is_invocable_r_v<std::size_t, F>);
   auto op_copyable = make_copyable_lambda(std::move(op_move_only));

diff --git a/cpp/include/kvikio/utils.hpp b/cpp/include/kvikio/utils.hpp
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include <cassert>
 #include <chrono>
 #include <cstring>
 #include <future>

diff --git a/cpp/src/defaults.cpp b/cpp/src/defaults.cpp
@@ -140,7 +140,7 @@ bool defaults::is_compat_mode_preferred(CompatMode compat_mode) noexcept
 
 bool defaults::is_compat_mode_preferred() { return is_compat_mode_preferred(compat_mode()); }
 
-BS::thread_pool& defaults::thread_pool() { return instance()->_thread_pool; }
+BS_thread_pool& defaults::thread_pool() { return instance()->_thread_pool; }
 
 unsigned int defaults::thread_pool_nthreads() { return thread_pool().get_thread_count(); }