-
Notifications
You must be signed in to change notification settings - Fork 39
add adaptive batch size heuristic for filtered search #309
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.
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
yuejiaointel
wants to merge
8
commits into
main
Choose a base branch
from
feature/adaptive-filtered-batch-size-v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
2af16f1
add adaptive batch size heuristic for filtered search
yuejiaointel 605a0be
use IDFilterRange instead of IDFilterSet in test
yuejiaointel 309d0ad
address PR review: refactor and optimize adaptive batch size
yuejiaointel 62d9bdf
add batch size cap and comments to adaptive filtered search
yuejiaointel ee06f00
apply clang-format to adaptive batch size code
yuejiaointel c92d331
remove batch size cap, add filter_stop early exit heuristic
yuejiaointel 6a10c8e
apply clang-format
yuejiaointel 90751ca
add test for filter_stop early exit heuristic
yuejiaointel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -118,15 +118,21 @@ class DynamicVamanaIndexImpl { | |
| // Selective search with IDSelector | ||
| auto old_sp = impl_->get_search_parameters(); | ||
| impl_->set_search_parameters(sp); | ||
| const float filter_stop = params ? params->filter_stop : 0.0f; | ||
|
|
||
| auto search_closure = [&](const auto& range, uint64_t SVS_UNUSED(tid)) { | ||
| for (auto i : range) { | ||
| // For every query | ||
| auto query = queries.get_datum(i); | ||
| auto iterator = impl_->batch_iterator(query); | ||
| size_t found = 0; | ||
| size_t total_checked = 0; | ||
| auto batch_size = std::max(k, sp.buffer_config_.get_search_window_size()); | ||
| do { | ||
| iterator.next(k); | ||
| batch_size = | ||
| predict_further_processing(total_checked, found, k, batch_size); | ||
| iterator.next(batch_size); | ||
| total_checked += iterator.size(); | ||
| for (auto& neighbor : iterator.results()) { | ||
| if (filter->is_member(neighbor.id())) { | ||
| result.set(neighbor, i, found); | ||
|
|
@@ -136,6 +142,10 @@ class DynamicVamanaIndexImpl { | |
| } | ||
| } | ||
| } | ||
| if (should_stop_filtered_search(total_checked, found, filter_stop)) { | ||
| found = 0; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does it mean that we should return no results even if some results are "found"? |
||
| break; | ||
| } | ||
| } while (found < k && !iterator.done()); | ||
|
|
||
| // Pad results if not enough neighbors found | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What will happen on the second iteration in case if:
?
How big bach_size will be here?