revert: update_dataset on strided matrix

rapidsai · Oct 3, 2024 · f14be71 · f14be71
1 parent f3388f0
commit f14be71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cpp/include/cuvs/neighbors/cagra.hpp b/cpp/include/cuvs/neighbors/cagra.hpp
@@ -432,8 +432,11 @@ struct index : cuvs::neighbors::index {
   void update_dataset(raft::resources const& res,
                       raft::device_matrix_view<const T, int64_t, raft::layout_stride> dataset)
   {
-    contiguous_dataset_ =
-      raft::make_device_matrix_view(dataset.data_handle(), dataset.extent(0), dataset.extent(1));
+    contiguous_dataset_ = std::monostate{};
+    if (dataset.stride(0) == dataset.extent(1) && dataset.stride(1) == 1) {
+      contiguous_dataset_ =
+        raft::make_device_matrix_view(dataset.data_handle(), dataset.extent(0), dataset.extent(1));
+    }
     dataset_ = make_aligned_dataset(res, dataset, 16);
   }
 

diff --git a/cpp/src/neighbors/detail/cagra/cagra_search.cuh b/cpp/src/neighbors/detail/cagra/cagra_search.cuh
@@ -177,6 +177,7 @@ void search_main(raft::resources const& res,
         std::get_if<raft::device_matrix_view<const T, int64_t, raft::row_major>>(&dataset_view);
 
       if (brute_force_dataset) {
+        RAFT_LOG_DEBUG("CAGRA is switching to brute force with sparsity:%d", sparsity);
         auto brute_force_idx =
           cuvs::neighbors::brute_force::build(res, *brute_force_dataset, index.metric());
         cuvs::neighbors::brute_force::search(