Maybe really fix benchmark issues?

rapidsai · Dec 18, 2024 · c316ca3 · c316ca3
1 parent b347d92
commit c316ca3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/cpp/bench/ann/CMakeLists.txt b/cpp/bench/ann/CMakeLists.txt
@@ -126,7 +126,7 @@ function(ConfigureAnnBench)
     PRIVATE ${ConfigureAnnBench_LINKS}
             nlohmann_json::nlohmann_json
             Threads::Threads
-            raft::raft_logger
+            $<TARGET_NAME_IF_EXISTS:raft::raft_logger>
             $<$<BOOL:${GPU_BUILD}>:CUDA::cudart_static>
             $<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
             $<TARGET_NAME_IF_EXISTS:conda_env>
@@ -176,9 +176,11 @@ function(ConfigureAnnBench)
   add_dependencies(CUVS_ANN_BENCH_ALL ${BENCH_NAME})
 endfunction()
 
-if(CUVS_FAISS_ENABLE_GPU)
+if(CUVS_FAISS_ENABLE_GPU OR CUVS_ANN_BENCH_SINGLE_EXE)
   add_library(cuvs_bench_logger OBJECT)
-  target_link_libraries(cuvs_bench_logger PRIVATE rmm::rmm_logger_impl raft::raft_logger_impl)
+  target_link_libraries(
+    cuvs_bench_logger PRIVATE rmm::rmm_logger_impl $<TARGET_NAME_IF_EXISTS:raft::raft_logger>
+  )
 endif()
 
 # ##################################################################################################
@@ -311,8 +313,7 @@ if(CUVS_ANN_BENCH_SINGLE_EXE)
             fmt::fmt-header-only
             spdlog::spdlog_header_only
             $<$<TARGET_EXISTS:CUDA::nvtx3>:CUDA::nvtx3>
-            rmm::rmm_logger_impl
-            raft::raft_logger_impl
+            cuvs_bench_logger
   )
   set_target_properties(
     ANN_BENCH

diff --git a/cpp/bench/ann/src/common/benchmark.hpp b/cpp/bench/ann/src/common/benchmark.hpp
@@ -20,8 +20,6 @@
 #include "dataset.hpp"
 #include "util.hpp"
 
-#include <raft/core/logger.hpp>
-
 #include <benchmark/benchmark.h>
 #include <unistd.h>
 
@@ -599,18 +597,16 @@ inline auto parse_string_flag(const char* arg, const char* pat, std::string& res
 
 inline auto run_main(int argc, char** argv) -> int
 {
-  bool force_overwrite                             = false;
-  bool build_mode                                  = false;
-  bool search_mode                                 = false;
-  bool no_lap_sync                                 = false;
-  std::string data_prefix                          = "data";
-  std::string index_prefix                         = "index";
-  std::string new_override_kv                      = "";
-  std::string mode                                 = "latency";
-  std::string threads_arg_txt                      = "";
-  std::vector<int> threads                         = {1, -1};  // min_thread, max_thread
-  std::string log_level_str                        = "";
-  [[maybe_unused]] raft::level_enum raft_log_level = raft::level_enum::off;
+  bool force_overwrite        = false;
+  bool build_mode             = false;
+  bool search_mode            = false;
+  bool no_lap_sync            = false;
+  std::string data_prefix     = "data";
+  std::string index_prefix    = "index";
+  std::string new_override_kv = "";
+  std::string mode            = "latency";
+  std::string threads_arg_txt = "";
+  std::vector<int> threads    = {1, -1};  // min_thread, max_thread
   kv_series override_kv{};
 
   char arg0_default[] = "benchmark";  // NOLINT
@@ -641,12 +637,7 @@ inline auto run_main(int argc, char** argv) -> int
         parse_string_flag(argv[i], "--index_prefix", index_prefix) ||
         parse_string_flag(argv[i], "--mode", mode) ||
         parse_string_flag(argv[i], "--override_kv", new_override_kv) ||
-        parse_string_flag(argv[i], "--threads", threads_arg_txt) ||
-        parse_string_flag(argv[i], "--raft_log_level", log_level_str)) {
-      if (!log_level_str.empty()) {
-        raft_log_level = static_cast<raft::level_enum>(std::stoi(log_level_str));
-        log_level_str  = "";
-      }
+        parse_string_flag(argv[i], "--threads", threads_arg_txt)) {
       if (!threads_arg_txt.empty()) {
         auto threads_arg = split(threads_arg_txt, ':');
         threads[0]       = std::stoi(threads_arg[0]);
@@ -675,8 +666,6 @@ inline auto run_main(int argc, char** argv) -> int
     }
   }
 
-  // raft::logger::get(RAFT_NAME).set_level(raft_log_level);
-
   Mode metric_objective = Mode::kLatency;
   if (mode == "throughput") { metric_objective = Mode::kThroughput; }