Support list query for explorer #1087
Merged
Conversation
This file contains 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
bonhunko
approved these changes
Jul 11, 2023
src/datumaro/components/algorithms/hash_key_inference/explorer.py
Outdated
Show resolved
Hide resolved
vinnamkim
reviewed
Jul 11, 2023
Comment on lines
77
to
101
| if isinstance(query, list): | ||
| topk_for_query = int(topk // len(query)) * 2 if not len(query) == 1 else topk | ||
| query_hash_key_list = [] | ||
| result_list = [] | ||
| for query_ in query: | ||
| if isinstance(query_, DatasetItem): | ||
| query_key = self._get_hash_key_from_item_query(query_) | ||
| query_hash_key_list.append(query_key) | ||
| elif isinstance(query_, str): | ||
| query_key = self._get_hash_key_from_text_query(query_) | ||
| query_hash_key_list.append(query_key) | ||
| else: | ||
| raise MediaTypeError( | ||
| "Unexpected media type of query '%s'. " | ||
| "Expected 'DatasetItem' or 'string', actual'%s'" % (query_, type(query_)) | ||
| ) | ||
|
|
||
| for query_key in query_hash_key_list: | ||
| unpacked_key = np.unpackbits(query_key.hash_key, axis=-1) | ||
| logits = calculate_hamming(unpacked_key, database_keys) | ||
| ind = np.argsort(logits) | ||
|
|
||
| item_list = np.array(self._item_list)[ind] | ||
| result_list.extend(item_list[:topk_for_query].tolist()) | ||
| return np.random.choice(result_list, topk) |
There was a problem hiding this comment.
Why is there a non-deterministic process here? Last time you said that the N-to-M top-k similarity search 1) finds the k similarity items for N queries (Nk candidates) and 2) pick up the top-k items from them, is it right?
There was a problem hiding this comment.
I updated the process for this. First make Ntopk or Ntopk_for_query candidates and logits for N queries and sort logits by value. Resort candidates through logit indices and pick up top-k items from them.
sooahleex
force-pushed
the
enhance/explore_list_query
branch
from
de801fe
to
c038a5e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
How to test
Checklist
License
Feel free to contact the maintainers if that's a concern.