Skip to content

perf(brute_force): skip csr_to_coo on inner-product filtered search #2128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maxwbuckley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf(brute_force): skip csr_to_coo on inner-product filtered search #2128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions cpp/src/neighbors/detail/knn_brute_force.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,13 +671,7 @@ void brute_force_search_filtered(

// create filter csr view
auto compressed_csr_view = csr.structure_view();
rmm::device_uvector<IdxT> rows(compressed_csr_view.get_nnz(), stream);
raft::sparse::convert::csr_to_coo(compressed_csr_view.get_indptr().data(),
compressed_csr_view.get_n_rows(),
rows.data(),
compressed_csr_view.get_nnz(),
stream);
auto dataset_view = raft::make_device_matrix_view<const T, IdxT, raft::row_major>(
auto dataset_view = raft::make_device_matrix_view<const T, IdxT, raft::row_major>(
idx.dataset().data_handle(), n_dataset, dim);

auto csr_view = raft::make_device_csr_matrix_view<DistanceT, IdxT, IdxT, IdxT>(
Expand Down Expand Up @@ -714,6 +708,14 @@ void brute_force_search_filtered(
query_norms_->view());
}
}
// rows array (COO row indices) is only needed by the L2/Cosine epilogue,
// so build it here rather than unconditionally above.
rmm::device_uvector<IdxT> rows(compressed_csr_view.get_nnz(), stream);
raft::sparse::convert::csr_to_coo(compressed_csr_view.get_indptr().data(),
compressed_csr_view.get_n_rows(),
rows.data(),
compressed_csr_view.get_nnz(),
stream);
cuvs::neighbors::detail::epilogue_on_csr(
res,
csr.get_elements().data(),
Expand Down
Loading