-
Notifications
You must be signed in to change notification settings - Fork 142
Vector Extension Type #6964
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
Vector Extension Type #6964
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
903eab9
vector type first draft
connortsui20 a2ec5b4
add `AnyTensor` matcher and impl cosine similarity for vector
connortsui20 b47bd61
add l2 norm scalar fn
connortsui20 e86b0db
clean up
connortsui20 d20e54c
lockfile
connortsui20 2ce76b5
clean up
connortsui20 c25e331
address comments
connortsui20 fcf3e67
make not fallible
connortsui20 30c4258
clean up
connortsui20 fe41f12
slice better
connortsui20 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,5 +6,7 @@ | |
| //! similarity. | ||
| pub mod fixed_shape; | ||
| pub mod vector; | ||
|
|
||
| pub mod matcher; | ||
| pub mod scalar_fns; | ||
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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: Copyright the Vortex contributors | ||
|
|
||
| //! Matcher for tensor-like extension types. | ||
|
|
||
| use vortex::dtype::extension::ExtDTypeRef; | ||
| use vortex::dtype::extension::Matcher; | ||
|
|
||
| use crate::fixed_shape::FixedShapeTensor; | ||
| use crate::fixed_shape::FixedShapeTensorMetadata; | ||
| use crate::vector::Vector; | ||
|
|
||
| /// Matcher for any tensor-like extension type. | ||
| /// | ||
| /// Currently the different kinds of tensors that are available are: | ||
| /// | ||
| /// - `FixedShapeTensor` | ||
| /// - `Vector` | ||
| pub struct AnyTensor; | ||
|
|
||
| /// The matched variant of a tensor-like extension type. | ||
| #[derive(Debug, PartialEq, Eq)] | ||
| pub enum TensorMatch<'a> { | ||
| /// A [`FixedShapeTensor`] extension type. | ||
| FixedShapeTensor(&'a FixedShapeTensorMetadata), | ||
| /// A [`Vector`] extension type. | ||
| Vector, | ||
| } | ||
|
|
||
| impl Matcher for AnyTensor { | ||
| type Match<'a> = TensorMatch<'a>; | ||
|
|
||
| fn try_match<'a>(item: &'a ExtDTypeRef) -> Option<Self::Match<'a>> { | ||
| if let Some(metadata) = item.metadata_opt::<FixedShapeTensor>() { | ||
| return Some(TensorMatch::FixedShapeTensor(metadata)); | ||
| } | ||
| if item.metadata_opt::<Vector>().is_some() { | ||
| return Some(TensorMatch::Vector); | ||
| } | ||
| None | ||
| } | ||
| } |
Oops, something went wrong.
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.
Are we certain no one has written a
vortex.fixed_shape_tensor?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.
We're pretty sure, this is a very recent addition