From a834c43234d7cf6638dc182c7bbc18d648d637e6 Mon Sep 17 00:00:00 2001 From: Nicholas Gates Date: Mon, 29 Apr 2024 23:09:59 +0100 Subject: [PATCH] Move PType into vortex-dtype --- Cargo.lock | 4 ---- vortex-array/Cargo.toml | 1 - vortex-array/src/scalar/mod.rs | 2 +- vortex-array/src/scalar/primitive.rs | 2 +- vortex-dict/Cargo.toml | 1 - vortex-dtype/Cargo.toml | 5 ----- 6 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b182c2153..9d10735412 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5185,7 +5185,6 @@ dependencies = [ "flatbuffers", "flatc", "flexbuffers", - "half", "humansize", "itertools 0.12.1", "leb128", @@ -5222,7 +5221,6 @@ version = "0.1.0" dependencies = [ "ahash", "criterion", - "half", "hashbrown", "linkme", "log", @@ -5240,8 +5238,6 @@ dependencies = [ name = "vortex-dtype" version = "0.1.0" dependencies = [ - "arrow-buffer 51.0.0", - "arrow-schema 51.0.0", "flatbuffers", "flatc", "half", diff --git a/vortex-array/Cargo.toml b/vortex-array/Cargo.toml index 979e671fb3..be54dc3056 100644 --- a/vortex-array/Cargo.toml +++ b/vortex-array/Cargo.toml @@ -25,7 +25,6 @@ arrow-buffer = { workspace = true } arrow-schema = { workspace = true } flatbuffers = { workspace = true } flexbuffers = { workspace = true } -half = { workspace = true } humansize = { workspace = true } itertools = { workspace = true } leb128 = { workspace = true } diff --git a/vortex-array/src/scalar/mod.rs b/vortex-array/src/scalar/mod.rs index 62f90de913..b38ea6201c 100644 --- a/vortex-array/src/scalar/mod.rs +++ b/vortex-array/src/scalar/mod.rs @@ -3,12 +3,12 @@ use std::fmt::{Debug, Display, Formatter}; pub use binary::*; pub use bool::*; pub use composite::*; -use half::f16; pub use list::*; pub use null::*; pub use primitive::*; pub use struct_::*; pub use utf8::*; +use vortex_dtype::half::f16; use vortex_dtype::NativePType; use vortex_dtype::{DType, FloatWidth, IntWidth, Nullability, Signedness}; use vortex_error::VortexResult; diff --git a/vortex-array/src/scalar/primitive.rs b/vortex-array/src/scalar/primitive.rs index 66032b0bd3..5570c55370 100644 --- a/vortex-array/src/scalar/primitive.rs +++ b/vortex-array/src/scalar/primitive.rs @@ -2,7 +2,7 @@ use std::any; use std::fmt::{Display, Formatter}; use std::mem::size_of; -use half::f16; +use vortex_dtype::half::f16; use vortex_dtype::{match_each_integer_ptype, match_each_native_ptype}; use vortex_dtype::{DType, Nullability}; use vortex_dtype::{NativePType, PType}; diff --git a/vortex-dict/Cargo.toml b/vortex-dict/Cargo.toml index d7554d53c0..e2f2dd1c2e 100644 --- a/vortex-dict/Cargo.toml +++ b/vortex-dict/Cargo.toml @@ -13,7 +13,6 @@ rust-version = { workspace = true } [dependencies] ahash = { workspace = true } -half = { workspace = true } hashbrown = { workspace = true } linkme = { workspace = true } log = { workspace = true } diff --git a/vortex-dtype/Cargo.toml b/vortex-dtype/Cargo.toml index 4b50a6e658..e129426438 100644 --- a/vortex-dtype/Cargo.toml +++ b/vortex-dtype/Cargo.toml @@ -15,12 +15,7 @@ rust-version = { workspace = true } name = "vortex_dtype" path = "src/lib.rs" -[features] -arrow = ["arrow-buffer", "arrow-schema"] - [dependencies] -arrow-buffer = { workspace = true, optional = true } -arrow-schema = { workspace = true, optional = true } flatbuffers = { workspace = true } half = { workspace = true } itertools = { workspace = true }