Skip to content
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

IVF-Flat: fix search batching #1764

Merged
merged 3 commits into from
Aug 23, 2023
+7 −1
Merged

IVF-Flat: fix search batching #1764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9742be
Fix the cluster probes (coarse_index) not being advanced when batching
achirkin Aug 23, 2023
5d165c5
Add the test cases
achirkin Aug 23, 2023
728e55d
Fix a typo missing comma
achirkin Aug 23, 2023
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
1 change: 1 addition & 0 deletions cpp/include/raft/neighbors/detail/ivf_flat_interleaved_scan-inl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,7 @@ void launch_kernel(Lambda lambda,
queries += grid_dim_y * index.dim();
neighbors += grid_dim_y * grid_dim_x * k;
distances += grid_dim_y * grid_dim_x * k;
coarse_index += grid_dim_y * n_probes;
}
}

Expand Down
7 changes: 6 additions & 1 deletion cpp/test/neighbors/ann_ivf_flat.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,11 @@ const std::vector<AnnIvfFlatInputs<int64_t>> inputs = {
raft::matrix::detail::select::warpsort::kMaxCapacity * 4,
raft::matrix::detail::select::warpsort::kMaxCapacity * 4,
raft::distance::DistanceType::InnerProduct,
false}};
false},

// The following two test cases should show very similar recall.
// num_queries, num_db_vecs, dim, k, nprobe, nlist, metric, adaptive_centers
{20000, 8712, 3, 10, 51, 66, raft::distance::DistanceType::L2Expanded, false},
{100000, 8712, 3, 10, 51, 66, raft::distance::DistanceType::L2Expanded, false}};

} // namespace raft::neighbors::ivf_flat