From a13bf1ad982a57cf898ccac42bb2286d63f5f4f9 Mon Sep 17 00:00:00 2001 From: Tarang Jain Date: Tue, 15 Oct 2024 14:44:45 -0700 Subject: [PATCH] rm bug --- cpp/bench/ann/CMakeLists.txt | 5 +++++ cpp/bench/ann/src/common/benchmark.hpp | 2 -- cpp/bench/ann/src/cuvs/cuvs_vamana.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cpp/bench/ann/CMakeLists.txt b/cpp/bench/ann/CMakeLists.txt index 197d3459d..77f389931 100644 --- a/cpp/bench/ann/CMakeLists.txt +++ b/cpp/bench/ann/CMakeLists.txt @@ -71,10 +71,15 @@ if(CUVS_ANN_BENCH_USE_CUVS_IVF_PQ OR CUVS_ANN_BENCH_USE_CUVS_CAGRA_HNSWLIB OR CUVS_KNN_BENCH_USE_CUVS_BRUTE_FORCE OR CUVS_ANN_BENCH_USE_CUVS_MG + OR CUVS_ANN_BENCH_USE_CUVS_VAMANA ) set(CUVS_ANN_BENCH_USE_CUVS ON) endif() +if(CUVS_ANN_BENCH_USE_CUVS_VAMANA) + set(CUVS_ANN_BENCH_USE_DISKANN ON) +endif() + # ################################################################################################## # * Fetch requirements ------------------------------------------------------------- diff --git a/cpp/bench/ann/src/common/benchmark.hpp b/cpp/bench/ann/src/common/benchmark.hpp index 53d58d2a6..ad1eab8e2 100644 --- a/cpp/bench/ann/src/common/benchmark.hpp +++ b/cpp/bench/ann/src/common/benchmark.hpp @@ -232,12 +232,10 @@ void bench_search(::benchmark::State& state, const T* query_set = nullptr; std::string filename; - std::cout << "index.algo " << index.algo << std::endl; if (index.algo != "diskann_ssd") filename = index.file; else filename = index.file + "_disk.index"; - std::cout << "filename " << filename << std::endl; if (!file_exists(filename)) { state.SkipWithError("Index file is missing. Run the benchmark in the build mode first."); return; diff --git a/cpp/bench/ann/src/cuvs/cuvs_vamana.cpp b/cpp/bench/ann/src/cuvs/cuvs_vamana.cpp index b3138b736..7c30a5420 100644 --- a/cpp/bench/ann/src/cuvs/cuvs_vamana.cpp +++ b/cpp/bench/ann/src/cuvs/cuvs_vamana.cpp @@ -36,7 +36,7 @@ template void parse_search_param(const nlohmann::json& conf, typename cuvs::bench::cuvs_vamana::search_param& param) { - if (conf.contains("L_search")) { param.L_search = conf.at("L_build"); } + if (conf.contains("L_search")) { param.L_search = conf.at("L_search"); } if (conf.contains("num_threads")) { param.num_threads = conf.at("num_threads"); } }