-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Add a bulk scoring interface to RandomVectorScorer #14978
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7beb1d2
introduce RandomVectorScorer.bulkScore
mccullocht 4c8c70b
utilize bulk scorer in HnswGraphSearcher.searchLevel. skipping in ent…
mccullocht 66b9b6f
use bulk scorer for exhaustive search
mccullocht 108fc3d
ensure bulk and non-bulk scores are the same.
ChrisHegarty 5b55a04
changes
ChrisHegarty b7fa31f
Merge branch 'main' into bulk-vector-scorer
ChrisHegarty 64a7e06
test score through the supplier/updatableScorer interface
ChrisHegarty f5e5273
more tests
ChrisHegarty 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
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 |
---|---|---|
|
@@ -34,6 +34,21 @@ public interface RandomVectorScorer { | |
*/ | ||
float score(int node) throws IOException; | ||
|
||
/** | ||
* Score a list of numNodes and store the results in the scores array. | ||
* | ||
* <p>This may be more efficient than calling {@link #score(int)} for each node. | ||
* | ||
* @param nodes array of nodes to score. | ||
* @param scores output array of scores corresponding to each node. | ||
* @param numNodes number of nodes to score. Must not exceed length of nodes or scores arrays. | ||
*/ | ||
default void bulkScore(int[] nodes, float[] scores, int numNodes) throws IOException { | ||
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. ++ this signature is more flexible than what I've been iterating on so far. I'm going to update my experiments to use similar. |
||
for (int i = 0; i < numNodes; i++) { | ||
scores[i] = score(nodes[i]); | ||
} | ||
} | ||
|
||
/** | ||
* @return the maximum possible ordinal for this scorer | ||
*/ | ||
|
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.
for
bulkScore
I think it would be beneficial for the API to returnmaxScore
. This way the collection and iteration can be skipped if the best score isn't competitive.I realize this "complicates" the
incVisitedCount
, but I think that can be fixed by pulling upknnCollector.incVisitedCount(numOrds)
.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.
#15021