Skip to content

Commit e658811

Browse files
committed
save
Signed-off-by: Andrew Duffy <andrew@a10y.dev>
1 parent e325039 commit e658811

File tree

11 files changed

+1093
-1076
lines changed

11 files changed

+1093
-1076
lines changed

encodings/fastlanes/src/bitpacking/vtable/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,10 @@ impl VTable for BitPacked {
297297
})
298298
}
299299

300-
fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<ExecutionResult> {
301-
Ok(ExecutionResult::done(unpack_array(array)?.into_array()))
300+
fn execute(array: Arc<Self::Array>, _ctx: &mut ExecutionCtx) -> VortexResult<ExecutionResult> {
301+
Ok(ExecutionResult::done(
302+
unpack_array(array.as_ref())?.into_array(),
303+
))
302304
}
303305

304306
fn execute_parent(

encodings/fastlanes/src/delta/array/delta_compress.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ mod tests {
106106
use vortex_session::VortexSession;
107107

108108
use crate::DeltaArray;
109-
use crate::bitpack_compress::bitpack_encode;
109+
use crate::bitpack_compress::BitPackedEncoder;
110110
use crate::delta::array::delta_decompress::delta_decompress;
111111
use crate::delta_compress;
112112

@@ -137,14 +137,14 @@ mod tests {
137137
(0u8..200).map(|i| (!(50..100).contains(&i)).then_some(i)),
138138
);
139139
let (bases, deltas) = delta_compress(&array, &mut SESSION.create_execution_ctx()).unwrap();
140-
let bitpacked_deltas = bitpack_encode(&deltas, 1, None).unwrap();
141-
let packed_delta = DeltaArray::try_new(
142-
bases.into_array(),
143-
bitpacked_deltas.into_array(),
144-
0,
145-
array.len(),
146-
)
147-
.unwrap();
140+
let bitpacked_deltas = BitPackedEncoder::new(&deltas)
141+
.with_bit_width(1)
142+
.pack()
143+
.unwrap()
144+
.into_array()
145+
.unwrap();
146+
let packed_delta =
147+
DeltaArray::try_new(bases.into_array(), bitpacked_deltas, 0, array.len()).unwrap();
148148
assert_arrays_eq!(packed_delta.to_primitive(), array);
149149
}
150150
}

vortex-array/src/arrays/lazy_patched/vtable/operations.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
44
use vortex_error::VortexResult;
55

66
use crate::DynArray;
7+
use crate::ExecutionCtx;
78
use crate::arrays::lazy_patched::LazyPatched;
89
use crate::arrays::lazy_patched::LazyPatchedArray;
910
use crate::scalar::Scalar;
1011
use crate::vtable::OperationsVTable;
1112

1213
impl OperationsVTable<LazyPatched> for LazyPatched {
13-
fn scalar_at(array: &LazyPatchedArray, index: usize) -> VortexResult<Scalar> {
14+
fn scalar_at(
15+
array: &LazyPatchedArray,
16+
index: usize,
17+
_ctx: &mut ExecutionCtx,
18+
) -> VortexResult<Scalar> {
1419
Ok(if let Some(scalar) = array.patches.get_patched(index)? {
1520
scalar
1621
} else {

vortex-array/src/arrays/patched/array.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,19 @@ use crate::patches::Patches;
2626
use crate::stats::ArrayStats;
2727
use crate::validity::Validity;
2828

29+
/// Shredded components of the [`PatchedArray`].
30+
///
31+
/// This is created when you consume the arrary using [`PatchedArray::into_parts`].
32+
pub struct PatchedArrayParts {
33+
pub inner: ArrayRef,
34+
pub n_chunks: usize,
35+
pub n_lanes: usize,
36+
pub offset: usize,
37+
pub lane_offsets: BufferHandle,
38+
pub indices: BufferHandle,
39+
pub values: ArrayRef,
40+
}
41+
2942
/// An array that partially "patches" another array with new values.
3043
#[derive(Debug, Clone)]
3144
pub struct PatchedArray {

vortex-array/src/vtable/dyn_.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use crate::buffer::BufferHandle;
1919
use crate::dtype::DType;
2020
use crate::executor::ExecutionCtx;
2121
use crate::serde::ArrayChildren;
22-
use crate::stats::ArrayStats;
2322
use crate::vtable::Array;
2423
use crate::vtable::VTable;
2524

vortex-cuda/benches/dynamic_dispatch_cuda.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,10 @@ use cudarc::driver::LaunchConfig;
1717
use cudarc::driver::PushKernelArg;
1818
use cudarc::driver::sys::CUevent_flags;
1919
use vortex::array::IntoArray;
20-
use vortex::array::ToCanonical;
21-
use vortex::array::arrays::DictArray;
2220
use vortex::array::arrays::PrimitiveArray;
23-
use vortex::array::scalar::Scalar;
2421
use vortex::array::validity::Validity::NonNullable;
2522
use vortex::buffer::Buffer;
2623
use vortex::dtype::PType;
27-
use vortex::encodings::alp::ALPArray;
28-
use vortex::encodings::alp::ALPFloat;
29-
use vortex::encodings::alp::Exponents;
30-
use vortex::encodings::alp::alp_encode;
31-
use vortex::encodings::fastlanes::BitPackedArray;
32-
use vortex::encodings::fastlanes::FoRArray;
3324
use vortex::encodings::runend::RunEndArray;
3425
use vortex::error::VortexExpect;
3526
use vortex::error::VortexResult;

0 commit comments

Comments
 (0)