-
Notifications
You must be signed in to change notification settings - Fork 128
chore[array]: move over filtering to {reduce/execute}_parent
#6312
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
4430dcf
wip
joseph-isaacs 4b34d59
wip
joseph-isaacs 4b84bb4
wip
joseph-isaacs 9653a31
wip
joseph-isaacs db03df4
wip
joseph-isaacs 82628db
wip
joseph-isaacs 761c6a9
wip
joseph-isaacs 0e6a0a2
wip
joseph-isaacs 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 |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ mod compare; | |
| mod filter; | ||
| mod mask; | ||
| mod nan_count; | ||
| mod slice; | ||
| mod take; | ||
|
|
||
| #[cfg(test)] | ||
|
|
||
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,33 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: Copyright the Vortex contributors | ||
|
|
||
| use std::ops::Range; | ||
|
|
||
| use vortex_array::ArrayRef; | ||
| use vortex_array::ExecutionCtx; | ||
| use vortex_array::IntoArray; | ||
| use vortex_array::arrays::SliceKernel; | ||
| use vortex_error::VortexResult; | ||
|
|
||
| use crate::ALPArray; | ||
| use crate::ALPVTable; | ||
|
|
||
| impl SliceKernel for ALPVTable { | ||
| fn slice( | ||
| array: &Self::Array, | ||
| range: Range<usize>, | ||
| _ctx: &mut ExecutionCtx, | ||
| ) -> VortexResult<Option<ArrayRef>> { | ||
| let sliced_alp = ALPArray::new( | ||
| array.encoded().slice(range.clone())?, | ||
| array.exponents(), | ||
| array | ||
| .patches() | ||
| .map(|p| p.slice(range)) | ||
| .transpose()? | ||
| .flatten(), | ||
| ) | ||
| .into_array(); | ||
| Ok(Some(sliced_alp)) | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ mod compress; | |
| mod compute; | ||
| mod decompress; | ||
| mod ops; | ||
| mod rules; | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
|
|
||
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,13 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: Copyright the Vortex contributors | ||
|
|
||
| use vortex_array::arrays::FilterExecuteAdaptor; | ||
| use vortex_array::arrays::SliceExecuteAdaptor; | ||
| use vortex_array::kernel::ParentKernelSet; | ||
|
|
||
| use crate::ALPVTable; | ||
|
|
||
| pub(super) const PARENT_KERNELS: ParentKernelSet<ALPVTable> = ParentKernelSet::new(&[ | ||
| ParentKernelSet::lift(&FilterExecuteAdaptor(ALPVTable)), | ||
| ParentKernelSet::lift(&SliceExecuteAdaptor(ALPVTable)), | ||
| ]); |
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 |
|---|---|---|
| @@ -1,10 +1,13 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: Copyright the Vortex contributors | ||
|
|
||
| use vortex_array::arrays::FilterExecuteAdaptor; | ||
| use vortex_array::arrays::SliceExecuteAdaptor; | ||
| use vortex_array::kernel::ParentKernelSet; | ||
|
|
||
| use crate::alp_rd::ALPRDVTable; | ||
|
|
||
| pub(crate) static PARENT_KERNELS: ParentKernelSet<ALPRDVTable> = | ||
| ParentKernelSet::new(&[ParentKernelSet::lift(&SliceExecuteAdaptor(ALPRDVTable))]); | ||
| pub(crate) static PARENT_KERNELS: ParentKernelSet<ALPRDVTable> = ParentKernelSet::new(&[ | ||
| ParentKernelSet::lift(&SliceExecuteAdaptor(ALPRDVTable)), | ||
| ParentKernelSet::lift(&FilterExecuteAdaptor(ALPRDVTable)), | ||
| ]); |
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
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.
Uh oh!
There was an error while loading. Please reload this page.