Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion encodings/alp/src/alp/compute/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_array::patches::Patches;
use vortex_dtype::DType;
use vortex_error::VortexResult;
Expand Down
4 changes: 2 additions & 2 deletions encodings/alp/src/alp/compute/mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
use vortex_array::ArrayRef;
use vortex_array::ExecutionCtx;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::MaskKernel;
use vortex_array::compute::MaskReduce;
use vortex_array::expr::MaskKernel;
use vortex_array::expr::MaskReduce;
use vortex_array::validity::Validity;
use vortex_error::VortexResult;

Expand Down
6 changes: 3 additions & 3 deletions encodings/alp/src/alp/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
use vortex_array::arrays::FilterExecuteAdaptor;
use vortex_array::arrays::SliceExecuteAdaptor;
use vortex_array::arrays::TakeExecuteAdaptor;
use vortex_array::compute::CastReduceAdaptor;
use vortex_array::compute::MaskExecuteAdaptor;
use vortex_array::compute::MaskReduceAdaptor;
use vortex_array::expr::BetweenReduceAdaptor;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::expr::CompareExecuteAdaptor;
use vortex_array::expr::MaskExecuteAdaptor;
use vortex_array::expr::MaskReduceAdaptor;
use vortex_array::kernel::ParentKernelSet;
use vortex_array::optimizer::rules::ParentRuleSet;

Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp_rd/compute/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_dtype::DType;
use vortex_error::VortexResult;

Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp_rd/compute/mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::arrays::ScalarFnArrayExt;
use vortex_array::compute::MaskReduce;
use vortex_array::expr::EmptyOptions;
use vortex_array::expr::Mask as MaskExpr;
use vortex_array::expr::MaskReduce;
use vortex_error::VortexResult;

use crate::ALPRDArray;
Expand Down
4 changes: 2 additions & 2 deletions encodings/alp/src/alp_rd/rules.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_array::compute::CastReduceAdaptor;
use vortex_array::compute::MaskReduceAdaptor;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::expr::MaskReduceAdaptor;
use vortex_array::optimizer::rules::ParentRuleSet;

use crate::alp_rd::ALPRDVTable;
Expand Down
4 changes: 2 additions & 2 deletions encodings/bytebool/src/compute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use vortex_array::ExecutionCtx;
use vortex_array::IntoArray;
use vortex_array::ToCanonical;
use vortex_array::arrays::TakeExecute;
use vortex_array::compute::CastReduce;
use vortex_array::compute::MaskReduce;
use vortex_array::expr::CastReduce;
use vortex_array::expr::MaskReduce;
use vortex_array::validity::Validity;
use vortex_array::vtable::ValidityHelper;
use vortex_dtype::DType;
Expand Down
4 changes: 2 additions & 2 deletions encodings/bytebool/src/rules.rs
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::arrays::SliceReduceAdaptor;
use vortex_array::compute::CastReduceAdaptor;
use vortex_array::compute::MaskReduceAdaptor;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::expr::MaskReduceAdaptor;
use vortex_array::optimizer::rules::ParentRuleSet;

use crate::ByteBoolVTable;
Expand Down
2 changes: 1 addition & 1 deletion encodings/datetime-parts/src/compute/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use vortex_array::Array;
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_dtype::DType;
use vortex_error::VortexResult;

Expand Down
4 changes: 2 additions & 2 deletions encodings/datetime-parts/src/compute/compare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ use vortex_array::IntoArray;
use vortex_array::arrays::ConstantArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::Operator;
use vortex_array::compute::and_kleene;
use vortex_array::compute::compare;
use vortex_array::compute::or_kleene;
use vortex_array::expr::CompareKernel;
use vortex_array::expr::and_kleene;
use vortex_array::expr::or_kleene;
use vortex_array::scalar::Scalar;
use vortex_dtype::DType;
use vortex_dtype::Nullability;
Expand Down
2 changes: 1 addition & 1 deletion encodings/datetime-parts/src/compute/mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::MaskReduce;
use vortex_array::expr::MaskReduce;
use vortex_error::VortexResult;

use crate::DateTimePartsArray;
Expand Down
4 changes: 2 additions & 2 deletions encodings/datetime-parts/src/compute/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ use vortex_array::arrays::FilterVTable;
use vortex_array::arrays::ScalarFnArray;
use vortex_array::arrays::SliceReduceAdaptor;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduceAdaptor;
use vortex_array::compute::MaskReduceAdaptor;
use vortex_array::expr::Between;
use vortex_array::expr::Binary;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::expr::MaskReduceAdaptor;
use vortex_array::optimizer::ArrayOptimizer;
use vortex_array::optimizer::rules::ArrayParentReduceRule;
use vortex_array::optimizer::rules::ParentRuleSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use vortex_array::Array;
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_dtype::DType;
use vortex_error::VortexResult;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::arrays::ScalarFnArrayExt;
use vortex_array::compute::MaskReduce;
use vortex_array::expr::EmptyOptions;
use vortex_array::expr::Mask as MaskExpr;
use vortex_array::expr::MaskReduce;
use vortex_error::VortexResult;

use crate::DecimalBytePartsArray;
Expand Down
4 changes: 2 additions & 2 deletions encodings/decimal-byte-parts/src/decimal_byte_parts/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use vortex_array::arrays::FilterArray;
use vortex_array::arrays::FilterReduceAdaptor;
use vortex_array::arrays::FilterVTable;
use vortex_array::arrays::SliceReduceAdaptor;
use vortex_array::compute::CastReduceAdaptor;
use vortex_array::compute::MaskReduceAdaptor;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::expr::MaskReduceAdaptor;
use vortex_array::optimizer::rules::ArrayParentReduceRule;
use vortex_array::optimizer::rules::ParentRuleSet;
use vortex_error::VortexResult;
Expand Down
117 changes: 62 additions & 55 deletions encodings/fastlanes/benches/compute_between.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@ mod primitive {
use vortex_array::VortexSessionExecute;
use vortex_array::arrays::ConstantArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::BooleanOperator;
use vortex_array::compute::Operator;
use vortex_array::compute::boolean;
use vortex_array::compute::compare;
use vortex_array::expr::BetweenOptions;
use vortex_array::expr::StrictComparison::NonStrict;
use vortex_array::expr::and_kleene;
use vortex_dtype::NativePType;
use vortex_error::VortexExpect;

Expand All @@ -98,24 +97,26 @@ mod primitive {
let mut rng = StdRng::seed_from_u64(0);
let arr = generate_primitive_array::<T>(&mut rng, len);

bencher.with_inputs(|| &arr).bench_refs(|arr| {
boolean(
&compare(
arr.as_ref(),
ConstantArray::new(min, arr.len()).as_ref(),
Operator::Gte,
)
.vortex_expect(""),
&compare(
arr.as_ref(),
ConstantArray::new(max, arr.len()).as_ref(),
Operator::Lt,
bencher
.with_inputs(|| (&arr, LEGACY_SESSION.create_execution_ctx()))
.bench_refs(|(arr, ctx)| {
and_kleene(
&compare(
arr.as_ref(),
ConstantArray::new(min, arr.len()).as_ref(),
Operator::Gte,
)
.vortex_expect(""),
&compare(
arr.as_ref(),
ConstantArray::new(max, arr.len()).as_ref(),
Operator::Lt,
)
.vortex_expect(""),
)
.vortex_expect(""),
BooleanOperator::And,
)
.vortex_expect("")
})
.vortex_expect("")
.execute::<RecursiveCanonical>(ctx)
})
}

#[divan::bench(
Expand Down Expand Up @@ -162,12 +163,11 @@ mod bitpack {
use vortex_array::VortexSessionExecute;
use vortex_array::arrays::ConstantArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::BooleanOperator;
use vortex_array::compute::Operator;
use vortex_array::compute::boolean;
use vortex_array::compute::compare;
use vortex_array::expr::BetweenOptions;
use vortex_array::expr::StrictComparison::NonStrict;
use vortex_array::expr::and_kleene;
use vortex_dtype::NativePType;
use vortex_error::VortexExpect;

Expand All @@ -188,23 +188,27 @@ mod bitpack {
let mut rng = StdRng::seed_from_u64(0);
let arr = generate_bit_pack_primitive_array::<T>(&mut rng, len);

bencher.with_inputs(|| &arr).bench_refs(|arr| {
boolean(
&compare(
arr.as_ref(),
ConstantArray::new(min, arr.len()).as_ref(),
Operator::Gte,
)
.vortex_expect(""),
&compare(
arr.as_ref(),
ConstantArray::new(max, arr.len()).as_ref(),
Operator::Lt,
bencher
.with_inputs(|| (&arr, LEGACY_SESSION.create_execution_ctx()))
.bench_refs(|(arr, ctx)| {
and_kleene(
&compare(
arr.as_ref(),
ConstantArray::new(min, arr.len()).as_ref(),
Operator::Gte,
)
.vortex_expect(""),
&compare(
arr.as_ref(),
ConstantArray::new(max, arr.len()).as_ref(),
Operator::Lt,
)
.vortex_expect(""),
)
.vortex_expect(""),
BooleanOperator::And,
)
})
.unwrap()
.execute::<RecursiveCanonical>(ctx)
.unwrap()
})
}

#[divan::bench(
Expand Down Expand Up @@ -251,12 +255,11 @@ mod alp {
use vortex_array::VortexSessionExecute;
use vortex_array::arrays::ConstantArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::BooleanOperator;
use vortex_array::compute::Operator;
use vortex_array::compute::boolean;
use vortex_array::compute::compare;
use vortex_array::expr::BetweenOptions;
use vortex_array::expr::StrictComparison::NonStrict;
use vortex_array::expr::and_kleene;
use vortex_dtype::NativePType;
use vortex_error::VortexExpect;

Expand All @@ -277,23 +280,27 @@ mod alp {
let mut rng = StdRng::seed_from_u64(0);
let arr = generate_alp_bit_pack_primitive_array::<T>(&mut rng, len);

bencher.with_inputs(|| &arr).bench_refs(|arr| {
boolean(
&compare(
arr.as_ref(),
ConstantArray::new(min, arr.len()).as_ref(),
Operator::Gte,
)
.vortex_expect(""),
&compare(
arr.as_ref(),
ConstantArray::new(max, arr.len()).as_ref(),
Operator::Lt,
bencher
.with_inputs(|| (&arr, LEGACY_SESSION.create_execution_ctx()))
.bench_refs(|(arr, ctx)| {
and_kleene(
&compare(
arr.as_ref(),
ConstantArray::new(min, arr.len()).as_ref(),
Operator::Gte,
)
.vortex_expect(""),
&compare(
arr.as_ref(),
ConstantArray::new(max, arr.len()).as_ref(),
Operator::Lt,
)
.vortex_expect(""),
)
.vortex_expect(""),
BooleanOperator::And,
)
})
.unwrap()
.execute::<RecursiveCanonical>(ctx)
.unwrap()
})
}

#[divan::bench(
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/bitpacking/compute/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_array::patches::Patches;
use vortex_array::vtable::ValidityHelper;
use vortex_dtype::DType;
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/bitpacking/vtable/rules.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_array::compute::CastReduceAdaptor;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::optimizer::rules::ParentRuleSet;

use crate::BitPackedVTable;
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/delta/compute/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_dtype::DType;
use vortex_dtype::Nullability::NonNullable;
use vortex_error::VortexResult;
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/delta/vtable/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_array::arrays::SliceReduceAdaptor;
use vortex_array::compute::CastReduceAdaptor;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::optimizer::rules::ParentRuleSet;

use crate::delta::vtable::DeltaVTable;
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/for/compute/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_array::ArrayRef;
use vortex_array::IntoArray;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_dtype::DType;
use vortex_error::VortexResult;

Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/for/vtable/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use vortex_array::arrays::FilterArray;
use vortex_array::arrays::FilterReduceAdaptor;
use vortex_array::arrays::FilterVTable;
use vortex_array::arrays::SliceReduceAdaptor;
use vortex_array::compute::CastReduceAdaptor;
use vortex_array::expr::CastReduceAdaptor;
use vortex_array::optimizer::rules::ArrayParentReduceRule;
use vortex_array::optimizer::rules::ParentRuleSet;
use vortex_error::VortexResult;
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/rle/compute/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use vortex_array::Array;
use vortex_array::ArrayRef;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::compute::CastReduce;
use vortex_array::expr::CastReduce;
use vortex_dtype::DType;
use vortex_error::VortexResult;

Expand Down
Loading
Loading