Merge develop

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

encodings/alp/src/alp/array.rs

@@ -16,6 +16,8 @@ use vortex_array::Precision;
 use vortex_array::ProstMetadata;
 use vortex_array::SerializeMetadata;
 use vortex_array::execution::ExecutionCtx;
+use vortex_array::kernel::KernelRef;
+use vortex_array::kernel::kernel;
 use vortex_array::patches::Patches;
 use vortex_array::patches::PatchesMetadata;
 use vortex_array::serde::ArrayChildren;
@@ -41,7 +43,6 @@ use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_ensure;
-use vortex_vector::Vector;
 
 use crate::ALPFloat;
 use crate::alp::Exponents;
@@ -140,10 +141,9 @@ impl VTable for ALPVTable {
         )
     }
 
-    fn bind_kernel(array: &ALPArray, ctx: &mut ExecutionCtx) -> VortexResult<Vector> {
-        let encoded_vector = array.encoded().bind_kernel(ctx)?;
-
-        let patches_vectors = if let Some(patches) = array.patches() {
+    fn bind_kernel(array: &ALPArray, ctx: &mut ExecutionCtx) -> VortexResult<KernelRef> {
+        let encoded = array.encoded().bind_kernel(ctx)?;
+        let patches_kernels = if let Some(patches) = array.patches() {
             Some((
                 patches.indices().bind_kernel(ctx)?,
                 patches.values().bind_kernel(ctx)?,
@@ -161,7 +161,24 @@ impl VTable for ALPVTable {
         let exponents = array.exponents();
 
         match_each_alp_float_ptype!(array.dtype().as_ptype(), |T| {
-            decompress_into_vector::<T>(encoded_vector, exponents, patches_vectors, patches_offset)
+            Ok(kernel(move || {
+                let encoded_vector = encoded.execute()?;
+                let patches_vectors = match patches_kernels {
+                    Some((idx_kernel, val_kernel, co_kernel)) => Some((
+                        idx_kernel.execute()?,
+                        val_kernel.execute()?,
+                        co_kernel.map(|k| k.execute()).transpose()?,
+                    )),
+                    None => None,
+                };
+
+                decompress_into_vector::<T>(
+                    encoded_vector,
+                    exponents,
+                    patches_vectors,
+                    patches_offset,
+                )
+            }))
         })
     }
 }

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

@@ -5,6 +5,8 @@ use vortex_array::DeserializeMetadata;
 use vortex_array::ProstMetadata;
 use vortex_array::SerializeMetadata;
 use vortex_array::execution::ExecutionCtx;
+use vortex_array::kernel::KernelRef;
+use vortex_array::kernel::kernel;
 use vortex_array::patches::Patches;
 use vortex_array::patches::PatchesMetadata;
 use vortex_array::serde::ArrayChildren;
@@ -23,7 +25,6 @@ use vortex_error::VortexError;
 use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_err;
-use vortex_vector::Vector;
 use vortex_vector::VectorMutOps;
 
 use crate::BitPackedArray;
@@ -172,8 +173,11 @@ impl VTable for BitPackedVTable {
         )
     }
 
-    fn bind_kernel(array: &BitPackedArray, _ctx: &mut ExecutionCtx) -> VortexResult<Vector> {
-        Ok(unpack_to_primitive_vector(array).freeze().into())
+    fn bind_kernel(array: &BitPackedArray, _ctx: &mut ExecutionCtx) -> VortexResult<KernelRef> {
+        let array = array.clone();
+        Ok(kernel(move || {
+            Ok(unpack_to_primitive_vector(&array).freeze().into())
+        }))
     }
 }
 

encodings/sequence/src/array.rs

@@ -16,6 +16,8 @@ use vortex_array::ProstMetadata;
 use vortex_array::SerializeMetadata;
 use vortex_array::arrays::PrimitiveArray;
 use vortex_array::execution::ExecutionCtx;
+use vortex_array::kernel::KernelRef;
+use vortex_array::kernel::kernel;
 use vortex_array::serde::ArrayChildren;
 use vortex_array::stats::ArrayStats;
 use vortex_array::stats::StatsSetRef;
@@ -48,7 +50,6 @@ use vortex_mask::Mask;
 use vortex_scalar::PValue;
 use vortex_scalar::Scalar;
 use vortex_scalar::ScalarValue;
-use vortex_vector::Vector;
 use vortex_vector::primitive::PVector;
 
 vtable!(Sequence);
@@ -268,23 +269,28 @@ impl VTable for SequenceVTable {
         ))
     }
 
-    fn bind_kernel(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Vector> {
+    fn bind_kernel(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<KernelRef> {
+        let array = array.clone();
+
         Ok(match_each_native_ptype!(array.ptype(), |P| {
             let base = array.base().cast::<P>();
             let multiplier = array.multiplier().cast::<P>();
 
-            let values = if multiplier == <P>::one() {
-                BufferMut::from_iter(
-                    (0..array.len()).map(|i| base + <P>::from_usize(i).vortex_expect("must fit")),
-                )
-            } else {
-                BufferMut::from_iter(
-                    (0..array.len())
-                        .map(|i| base + <P>::from_usize(i).vortex_expect("must fit") * multiplier),
-                )
-            };
-
-            PVector::<P>::new(values.freeze(), Mask::new_true(array.len())).into()
+            kernel(move || {
+                let values =
+                    if multiplier == <P>::one() {
+                        BufferMut::from_iter(
+                            (0..array.len())
+                                .map(|i| base + <P>::from_usize(i).vortex_expect("must fit")),
+                        )
+                    } else {
+                        BufferMut::from_iter((0..array.len()).map(|i| {
+                            base + <P>::from_usize(i).vortex_expect("must fit") * multiplier
+                        }))
+                    };
+
+                Ok(PVector::<P>::new(values.freeze(), Mask::new_true(array.len())).into())
+            })
         }))
     }
 }

vortex-array/src/lib.rs

@@ -35,7 +35,7 @@ pub mod expr;
 mod expression;
 mod hash;
 pub mod iter;
-mod kernel;
+pub mod kernel;
 mod mask;
 mod mask_future;
 mod metadata;