Merge pull request #655 from rapidsai/branch-25.02

Forward-merge branch-25.02 into branch-25.04
rapidsai · Feb 5, 2025 · 95af521 · 95af521
2 parents 0cef61e + ddf1c8f
commit 95af521
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cpp/bench/ann/src/common/benchmark.hpp b/cpp/bench/ann/src/common/benchmark.hpp
@@ -571,7 +571,7 @@ void dispatch_benchmark(std::string cmdline,
       }
     }
     std::swap(more_indices, indices);  // update the config in case algorithms need to access it
-    register_build<T>(dataset, more_indices, force_overwrite, no_lap_sync);
+    register_build<T>(dataset, indices, force_overwrite, no_lap_sync);
   } else if (search_mode) {
     if (file_exists(query_file)) {
       log_info("Using the query file '%s'", query_file.c_str());

diff --git a/cpp/cmake/patches/faiss_override.json b/cpp/cmake/patches/faiss_override.json
@@ -1,9 +1,9 @@
 {
     "packages" : {
       "faiss" : {
-        "version": "1.7.4",
+        "version": "1.10.0",
         "git_url": "https://github.com/facebookresearch/faiss.git",
-        "git_tag": "main"
+        "git_tag": "v1.10.0"
       }
     }
   }