From 3468a6c5da8cbbdb3044fdfaa43bfbf2cd614ed9 Mon Sep 17 00:00:00 2001 From: Nicholas Gates Date: Sat, 2 Mar 2024 15:14:23 +0000 Subject: [PATCH] FastLanes bitpacking --- fastlanez-sys/src/lib.rs | 2 +- pyvortex/src/array.rs | 14 +++++++------- vortex-fastlanes/src/bitpacking.rs | 2 +- vortex-fastlanes/src/compress.rs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fastlanez-sys/src/lib.rs b/fastlanez-sys/src/lib.rs index 2c149a1a2a..2293cfca7f 100644 --- a/fastlanez-sys/src/lib.rs +++ b/fastlanez-sys/src/lib.rs @@ -19,7 +19,7 @@ #![allow(non_camel_case_types)] #![allow(non_snake_case)] -use std::mem::{MaybeUninit, size_of}; +use std::mem::{size_of, MaybeUninit}; use arrayref::array_mut_ref; use seq_macro::seq; diff --git a/pyvortex/src/array.rs b/pyvortex/src/array.rs index e30023ca0a..60dbdfb25a 100644 --- a/pyvortex/src/array.rs +++ b/pyvortex/src/array.rs @@ -16,7 +16,6 @@ use paste::paste; use pyo3::exceptions::PyValueError; use pyo3::prelude::*; -use vortex::array::{Array, ArrayKind, ArrayRef}; use vortex::array::bool::BoolArray; use vortex::array::chunked::ChunkedArray; use vortex::array::constant::ConstantArray; @@ -26,15 +25,16 @@ use vortex::array::struct_::StructArray; use vortex::array::typed::TypedArray; use vortex::array::varbin::VarBinArray; use vortex::array::varbinview::VarBinViewArray; -use vortex_alp::{ALP_ENCODING, ALPArray}; -use vortex_dict::{DICT_ENCODING, DictArray}; +use vortex::array::{Array, ArrayKind, ArrayRef}; +use vortex_alp::{ALPArray, ALP_ENCODING}; +use vortex_dict::{DictArray, DICT_ENCODING}; use vortex_fastlanes::BitPackedArray; -use vortex_ffor::{FFOR_ENCODING, FFORArray}; -use vortex_ree::{REE_ENCODING, REEArray}; +use vortex_ffor::{FFORArray, FFOR_ENCODING}; +use vortex_ree::{REEArray, REE_ENCODING}; use vortex_roaring::{ - ROARING_BOOL_ENCODING, ROARING_INT_ENCODING, RoaringBoolArray, RoaringIntArray, + RoaringBoolArray, RoaringIntArray, ROARING_BOOL_ENCODING, ROARING_INT_ENCODING, }; -use vortex_zigzag::{ZIGZAG_ENCODING, ZigZagArray}; +use vortex_zigzag::{ZigZagArray, ZIGZAG_ENCODING}; use crate::dtype::PyDType; use crate::error::PyVortexError; diff --git a/vortex-fastlanes/src/bitpacking.rs b/vortex-fastlanes/src/bitpacking.rs index 01e086255d..87dc5880b4 100644 --- a/vortex-fastlanes/src/bitpacking.rs +++ b/vortex-fastlanes/src/bitpacking.rs @@ -2,7 +2,7 @@ use std::any::Any; use std::sync::{Arc, RwLock}; use vortex::array::{ - Array, ArrayRef, ArrowIterator, check_validity_buffer, Encoding, EncodingId, EncodingRef, + check_validity_buffer, Array, ArrayRef, ArrowIterator, Encoding, EncodingId, EncodingRef, }; use vortex::compress::EncodingCompression; use vortex::dtype::DType; diff --git a/vortex-fastlanes/src/compress.rs b/vortex-fastlanes/src/compress.rs index b4e1f3ecce..b9cbe0122f 100644 --- a/vortex-fastlanes/src/compress.rs +++ b/vortex-fastlanes/src/compress.rs @@ -16,9 +16,9 @@ use arrayref::array_ref; use log::debug; use fastlanez_sys::TryBitPack; -use vortex::array::{Array, ArrayRef}; use vortex::array::downcast::DowncastArrayBuiltin; use vortex::array::primitive::PrimitiveArray; +use vortex::array::{Array, ArrayRef}; use vortex::compress::{CompressConfig, CompressCtx, Compressor, EncodingCompression}; use vortex::ptype::{NativePType, PType}; use vortex::scalar::ListScalarVec; @@ -163,8 +163,8 @@ fn num_exceptions(bit_width: u8, bit_width_freq: &Vec) -> usize { mod test { use std::collections::HashSet; - use vortex::array::Encoding; use vortex::array::primitive::PrimitiveEncoding; + use vortex::array::Encoding; use super::*;