Skip to content

Move scalar functions out of vortex-array into vortex-functions #10762

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.

Sign up for GitHub

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

Draft
robert3005 wants to merge 1 commit into from
+3,966 −3,603
Draft

Move scalar functions out of vortex-array into vortex-functions #10762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/workflows/codspeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ jobs:
- { shard: 3, name: "Array dictionaries", packages: "vortex-array", array-group: "dictionary", features: "--features _test-harness" }
- { shard: 4, name: "Array builders & views", packages: "vortex-array", array-group: "builders", features: "--features _test-harness" }
- { shard: 5, name: "Core & encodings", packages: "vortex-buffer vortex-error vortex-mask vortex-compute vortex-file vortex-alp vortex-bytebool vortex-datetime-parts" }
- { shard: 6, name: "Main library & storage", packages: "vortex vortex-btrblocks vortex-compressor vortex-row" }
- { shard: 6, name: "Main library, functions & storage", packages: "vortex vortex-functions vortex-arrow vortex-btrblocks vortex-compressor vortex-row" }
- { shard: 7, name: "FastLanes & decimals", packages: "vortex-decimal-byte-parts vortex-fastlanes", features: "--features _test-harness" }
- { shard: 8, name: "Encodings & layout", packages: "vortex-pco vortex-runend vortex-sequence vortex-sparse vortex-zigzag vortex-zstd vortex-layout" }
- { shard: 8, name: "Encodings & layout", packages: "vortex-onpair vortex-pco vortex-runend vortex-sequence vortex-sparse vortex-zigzag vortex-zstd vortex-layout" }
- { shard: 9, name: "Strings, tensor & spatial", packages: "vortex-fsst vortex-tensor vortex-spatial", features: "--features _test-harness" }
name: "Benchmark with Codspeed (Shard #${{ matrix.shard }} - ${{ matrix.name }})"
timeout-minutes: 30
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
groups = {
"dictionary": ("dict_", "chunked_dict_", "patches_"),
"selection": ("take_", "filter_", "piecewise_sequence_"),
"compute": ("aggregate_", "cast_", "expr_", "binary_ops", "compare", "kleene_bool", "like", "list_sum"),
"compute": ("aggregate_", "cast_", "expr_", "binary_ops", "compare", "kleene_bool"),
}
manifest = tomllib.loads(pathlib.Path("vortex-array/Cargo.toml").read_text())
benches = []
Expand Down
44 changes: 44 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ members = [
"vortex-io",
"vortex-cloud",
"vortex-array",
"vortex-functions",
"vortex-expr",
"vortex-arrow",
"vortex-row",
Expand Down Expand Up @@ -324,6 +325,7 @@ vortex-expr = { version = "0.1.0", path = "./vortex-expr", default-features = fa
vortex-fastlanes = { version = "0.1.0", path = "./encodings/fastlanes", default-features = false }
vortex-file = { version = "0.1.0", path = "./vortex-file", default-features = false }
vortex-fsst = { version = "0.1.0", path = "./encodings/fsst", default-features = false }
vortex-functions = { version = "0.1.0", path = "./vortex-functions", default-features = false }
vortex-io = { version = "0.1.0", path = "./vortex-io", default-features = false }
vortex-ipc = { version = "0.1.0", path = "./vortex-ipc", default-features = false }
vortex-json = { version = "0.1.0", path = "./vortex-json", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions encodings/alp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ vortex-array = { workspace = true }
vortex-buffer = { workspace = true }
vortex-error = { workspace = true }
vortex-fastlanes = { workspace = true }
vortex-functions = { workspace = true }
vortex-mask = { workspace = true }
vortex-session = { workspace = true }

Expand Down
12 changes: 6 additions & 6 deletions encodings/alp/src/alp/compute/between.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ use vortex_array::ArrayRef;
use vortex_array::ArrayView;
use vortex_array::IntoArray;
use vortex_array::arrays::ConstantArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::NativeDType;
use vortex_array::dtype::NativePType;
use vortex_array::dtype::Nullability;
use vortex_array::scalar::PValue;
use vortex_array::scalar::Scalar;
use vortex_array::scalar_fn::fns::between::BetweenOptions;
use vortex_array::scalar_fn::fns::between::BetweenReduce;
use vortex_array::scalar_fn::fns::between::StrictComparison;
use vortex_error::VortexResult;
use vortex_functions::between::BetweenOptions;
use vortex_functions::between::BetweenReduce;
use vortex_functions::between::StrictComparison;
use vortex_functions::builtins::ArrayFunctions;

use crate::ALP;
use crate::ALPFloat;
Expand Down Expand Up @@ -145,8 +145,8 @@ mod tests {
use vortex_array::assert_arrays_eq;
use vortex_array::dtype::Nullability;
use vortex_array::scalar::Scalar;
use vortex_array::scalar_fn::fns::between::BetweenOptions;
use vortex_array::scalar_fn::fns::between::StrictComparison;
use vortex_functions::between::BetweenOptions;
use vortex_functions::between::StrictComparison;
use vortex_session::VortexSession;

use crate::ALPArray;
Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp/compute/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use vortex_array::ArrayView;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::DType;
use vortex_array::scalar_fn::fns::cast::CastReduce;
use vortex_array::scalar_fn::builtin::cast::CastReduce;
use vortex_error::VortexResult;

use crate::ALPArrayExt;
Expand Down
10 changes: 5 additions & 5 deletions encodings/alp/src/alp/compute/compare.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ use vortex_array::arrays::ConstantArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::NativePType;
use vortex_array::scalar::Scalar;
use vortex_array::scalar_fn::fns::binary::CompareKernel;
use vortex_array::scalar_fn::fns::operators::CompareOperator;
use vortex_array::scalar_fn::fns::operators::Operator;
use vortex_array::scalar_fn::builtin::binary::CompareKernel;
use vortex_array::scalar_fn::builtin::operators::CompareOperator;
use vortex_array::scalar_fn::builtin::operators::Operator;
use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_error::vortex_err;
Expand Down Expand Up @@ -165,8 +165,8 @@ mod tests {
use vortex_array::dtype::Nullability;
use vortex_array::dtype::PType;
use vortex_array::scalar::Scalar;
use vortex_array::scalar_fn::fns::operators::CompareOperator;
use vortex_array::scalar_fn::fns::operators::Operator;
use vortex_array::scalar_fn::builtin::operators::CompareOperator;
use vortex_array::scalar_fn::builtin::operators::Operator;
use vortex_session::VortexSession;

use super::*;
Expand Down
6 changes: 3 additions & 3 deletions encodings/alp/src/alp/compute/mask.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use vortex_array::ArrayView;
use vortex_array::ExecutionCtx;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::scalar_fn::fns::mask::MaskKernel;
use vortex_array::scalar_fn::fns::mask::MaskReduce;
use vortex_array::scalar_fn::builtin::mask::MaskKernel;
use vortex_array::scalar_fn::builtin::mask::MaskReduce;
use vortex_array::validity::Validity;
use vortex_error::VortexResult;

Expand Down Expand Up @@ -58,7 +58,7 @@ mod test {
use vortex_array::arrays::PrimitiveArray;
use vortex_array::compute::conformance::mask::test_mask_conformance;
use vortex_array::dtype::Nullability;
use vortex_array::scalar_fn::fns::mask::MaskKernel;
use vortex_array::scalar_fn::builtin::mask::MaskKernel;
use vortex_buffer::buffer;
use vortex_session::VortexSession;

Expand Down
14 changes: 7 additions & 7 deletions encodings/alp/src/alp/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ use vortex_array::arrays::slice::SliceExecuteAdaptor;
use vortex_array::optimizer::kernels::ArrayKernelsExt;
use vortex_array::optimizer::rules::ParentRuleSet;
use vortex_array::scalar_fn::ScalarFnVTable;
use vortex_array::scalar_fn::fns::between::BetweenReduceAdaptor;
use vortex_array::scalar_fn::fns::binary::Binary;
use vortex_array::scalar_fn::fns::binary::CompareExecuteAdaptor;
use vortex_array::scalar_fn::fns::cast::CastReduceAdaptor;
use vortex_array::scalar_fn::fns::mask::Mask;
use vortex_array::scalar_fn::fns::mask::MaskExecuteAdaptor;
use vortex_array::scalar_fn::fns::mask::MaskReduceAdaptor;
use vortex_array::scalar_fn::builtin::binary::Binary;
use vortex_array::scalar_fn::builtin::binary::CompareExecuteAdaptor;
use vortex_array::scalar_fn::builtin::cast::CastReduceAdaptor;
use vortex_array::scalar_fn::builtin::mask::Mask;
use vortex_array::scalar_fn::builtin::mask::MaskExecuteAdaptor;
use vortex_array::scalar_fn::builtin::mask::MaskReduceAdaptor;
use vortex_functions::between::BetweenReduceAdaptor;
use vortex_session::VortexSession;

use crate::ALP;
Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp_rd/compute/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use vortex_array::ArrayView;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::DType;
use vortex_array::scalar_fn::fns::cast::CastReduce;
use vortex_array::scalar_fn::builtin::cast::CastReduce;
use vortex_error::VortexResult;

use crate::ALPRDArrayExt;
Expand Down
4 changes: 2 additions & 2 deletions encodings/alp/src/alp_rd/compute/mask.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
use vortex_array::ArrayRef;
use vortex_array::ArrayView;
use vortex_array::IntoArray;
use vortex_array::scalar_fn::fns::mask::Mask as MaskExpr;
use vortex_array::scalar_fn::fns::mask::MaskReduce;
use vortex_array::scalar_fn::builtin::mask::Mask as MaskExpr;
use vortex_array::scalar_fn::builtin::mask::MaskReduce;
use vortex_error::VortexResult;

use crate::ALPRD;
Expand Down
4 changes: 2 additions & 2 deletions encodings/alp/src/alp_rd/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_array::optimizer::rules::ParentRuleSet;
use vortex_array::scalar_fn::fns::cast::CastReduceAdaptor;
use vortex_array::scalar_fn::fns::mask::MaskReduceAdaptor;
use vortex_array::scalar_fn::builtin::cast::CastReduceAdaptor;
use vortex_array::scalar_fn::builtin::mask::MaskReduceAdaptor;

use crate::alp_rd::ALPRD;

Expand Down
16 changes: 8 additions & 8 deletions encodings/bytebool/src/compute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ use vortex_array::arrays::dict::TakeExecute;
use vortex_array::buffer::BufferHandle;
use vortex_array::dtype::DType;
use vortex_array::match_each_integer_ptype;
use vortex_array::scalar_fn::fns::binary::BooleanKernel;
use vortex_array::scalar_fn::fns::binary::kleene_boolean_buffer_scalar;
use vortex_array::scalar_fn::fns::binary::kleene_boolean_buffers;
use vortex_array::scalar_fn::fns::cast::CastKernel;
use vortex_array::scalar_fn::fns::cast::CastReduce;
use vortex_array::scalar_fn::fns::mask::MaskReduce;
use vortex_array::scalar_fn::fns::operators::Operator;
use vortex_array::scalar_fn::builtin::binary::BooleanKernel;
use vortex_array::scalar_fn::builtin::binary::kleene_boolean_buffer_scalar;
use vortex_array::scalar_fn::builtin::binary::kleene_boolean_buffers;
use vortex_array::scalar_fn::builtin::cast::CastKernel;
use vortex_array::scalar_fn::builtin::cast::CastReduce;
use vortex_array::scalar_fn::builtin::mask::MaskReduce;
use vortex_array::scalar_fn::builtin::operators::Operator;
use vortex_array::validity::Validity;
use vortex_buffer::BitBuffer;
use vortex_buffer::ByteBuffer;
Expand Down Expand Up @@ -182,7 +182,7 @@ mod tests {
use vortex_array::compute::conformance::filter::test_filter_conformance;
use vortex_array::compute::conformance::mask::test_mask_conformance;
use vortex_array::compute::conformance::take::test_take_conformance;
use vortex_array::scalar_fn::fns::operators::Operator;
use vortex_array::scalar_fn::builtin::operators::Operator;
use vortex_error::vortex_err;
use vortex_session::VortexSession;

Expand Down
8 changes: 4 additions & 4 deletions encodings/bytebool/src/kernel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ use vortex_array::arrays::Dict;
use vortex_array::arrays::dict::TakeExecuteAdaptor;
use vortex_array::optimizer::kernels::ArrayKernelsExt;
use vortex_array::scalar_fn::ScalarFnVTable;
use vortex_array::scalar_fn::fns::binary::Binary;
use vortex_array::scalar_fn::fns::binary::BooleanExecuteAdaptor;
use vortex_array::scalar_fn::fns::cast::Cast;
use vortex_array::scalar_fn::fns::cast::CastExecuteAdaptor;
use vortex_array::scalar_fn::builtin::binary::Binary;
use vortex_array::scalar_fn::builtin::binary::BooleanExecuteAdaptor;
use vortex_array::scalar_fn::builtin::cast::Cast;
use vortex_array::scalar_fn::builtin::cast::CastExecuteAdaptor;
use vortex_session::VortexSession;

use crate::ByteBool;
Expand Down
4 changes: 2 additions & 2 deletions encodings/bytebool/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

use vortex_array::arrays::slice::SliceReduceAdaptor;
use vortex_array::optimizer::rules::ParentRuleSet;
use vortex_array::scalar_fn::fns::cast::CastReduceAdaptor;
use vortex_array::scalar_fn::fns::mask::MaskReduceAdaptor;
use vortex_array::scalar_fn::builtin::cast::CastReduceAdaptor;
use vortex_array::scalar_fn::builtin::mask::MaskReduceAdaptor;

use crate::ByteBool;

Expand Down
Loading
Loading