Merge branch 'branch-23.12' into fea-2312-benchmarks_throughput_mode

rapidsai · Oct 20, 2023 · 638ecb6 · 638ecb6
2 parents 1f75ede + 945355d
commit 638ecb6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/cpp/test/neighbors/ann_cagra.cuh b/cpp/test/neighbors/ann_cagra.cuh
@@ -457,6 +457,7 @@ class AnnCagraFilterTest : public ::testing::TestWithParam<AnnCagraInputs> {
         cagra::index_params index_params;
         index_params.metric = ps.metric;  // Note: currently ony the cagra::index_params metric is
                                           // not used for knn_graph building.
+        index_params.nn_descent_niter = 50;
         cagra::search_params search_params;
         search_params.algo         = ps.algo;
         search_params.max_queries  = ps.max_queries;
@@ -571,6 +572,7 @@ class AnnCagraFilterTest : public ::testing::TestWithParam<AnnCagraInputs> {
         cagra::index_params index_params;
         index_params.metric = ps.metric;  // Note: currently ony the cagra::index_params metric is
                                           // not used for knn_graph building.
+        index_params.nn_descent_niter = 50;
         cagra::search_params search_params;
         search_params.algo         = ps.algo;
         search_params.max_queries  = ps.max_queries;

diff --git a/cpp/test/neighbors/ann_nn_descent.cuh b/cpp/test/neighbors/ann_nn_descent.cuh
@@ -90,6 +90,7 @@ class AnnNNDescentTest : public ::testing::TestWithParam<AnnNNDescentInputs> {
         index_params.metric                    = ps.metric;
         index_params.graph_degree              = ps.graph_degree;
         index_params.intermediate_graph_degree = 2 * ps.graph_degree;
+        index_params.max_iterations            = 50;
 
         auto database_view = raft::make_device_matrix_view<const DataT, int64_t>(
           (const DataT*)database.data(), ps.n_rows, ps.dim);

diff --git a/python/raft-ann-bench/src/raft-ann-bench/plot/__main__.py b/python/raft-ann-bench/src/raft-ann-bench/plot/__main__.py
@@ -352,7 +352,9 @@ def load_all_results(
     result_files = [
         result_filename
         for result_filename in result_files
-        if f"{k}-{batch_size}" in result_filename
+        if "csv" in result_filename
+        and f"{k}-{batch_size}"
+        == "-".join(result_filename.replace(".csv", "").split("-")[1:])
     ]
     if len(algorithms) > 0:
         result_files = [

diff --git a/python/raft-ann-bench/src/raft-ann-bench/run/algos.yaml b/python/raft-ann-bench/src/raft-ann-bench/run/algos.yaml
@@ -10,13 +10,13 @@ faiss_gpu_ivf_pq:
 faiss_gpu_ivf_sq:
   executable: FAISS_GPU_IVF_PQ_ANN_BENCH
   requires_gpu: true
-faiss_flat:
+faiss_cpu_flat:
   executable: FAISS_CPU_FLAT_ANN_BENCH
   requires_gpu: false
-faiss_ivf_flat:
+faiss_cpu_ivf_flat:
   executable: FAISS_CPU_IVF_FLAT_ANN_BENCH
   requires_gpu: false
-faiss_ivf_pq:
+faiss_cpu_ivf_pq:
   executable: FAISS_CPU_IVF_PQ_ANN_BENCH
   requires_gpu: false
 raft_ivf_flat: