From 88836079378a2a6c41ae017617fc8ae3288e869b Mon Sep 17 00:00:00 2001 From: Piotr Beling Date: Thu, 26 Sep 2024 21:11:18 +0200 Subject: [PATCH] aligned-vec updated to 0.6 --- bitm/Cargo.toml | 4 ++-- bitm/src/bitvec.rs | 4 ++-- cseq_benchmark/Cargo.toml | 4 ++-- cseq_benchmark/src/elias_fano.rs | 2 +- csf_benchmark/Cargo.toml | 4 ++-- dyn_size_of/Cargo.toml | 4 ++-- dyn_size_of/src/lib.rs | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bitm/Cargo.toml b/bitm/Cargo.toml index a92a000..e7d58a0 100644 --- a/bitm/Cargo.toml +++ b/bitm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitm" -version = "0.4.2" +version = "0.4.3" edition = "2021" authors = ["Piotr Beling "] license = "MIT OR Apache-2.0" @@ -14,7 +14,7 @@ keywords = [ "bit", "bitmap", "rank", "bitvector", "bitset" ] [dependencies] dyn_size_of = { version="0.4", path="../dyn_size_of" } -aligned-vec = { version="0.5", optional=true } # for construcing cache-aligment bit vectors, which usually speeds up rank and select +aligned-vec = { version="0.6", optional=true } # for construcing cache-aligment bit vectors, which usually speeds up rank and select [dev-dependencies] criterion = "0.5" diff --git a/bitm/src/bitvec.rs b/bitm/src/bitvec.rs index 98a7ad9..9df998c 100644 --- a/bitm/src/bitvec.rs +++ b/bitm/src/bitvec.rs @@ -489,9 +489,9 @@ impl BitVec for Box<[u64]> { } #[cfg(feature = "aligned-vec")] -impl BitVec for aligned_vec::ABox<[u64]> { +impl BitVec for aligned_vec::ABox<[u64], aligned_vec::ConstAlign> { #[inline(always)] fn with_64bit_segments(segments_value: u64, segments_len: usize) -> Self { - aligned_vec::avec![segments_value; segments_len].into_boxed_slice() + aligned_vec::avec![[ALIGN] | segments_value; segments_len].into_boxed_slice() } fn with_bitwords(word: u64, word_len_bits: u8, words_count: usize) -> Self { diff --git a/cseq_benchmark/Cargo.toml b/cseq_benchmark/Cargo.toml index e5bfae3..c3e8975 100644 --- a/cseq_benchmark/Cargo.toml +++ b/cseq_benchmark/Cargo.toml @@ -15,7 +15,7 @@ keywords = [ "compression", "sequence", "succinct", "elias-fano", "benchmark" ] [dependencies] butils = { version="0.1", path="../butils" } clap = { version="4", features = ["derive"] } -dyn_size_of = { version=">=0.4.2", path="../dyn_size_of", features=["aligned-vec"] } +dyn_size_of = { version=">=0.4.3", path="../dyn_size_of", features=["aligned-vec"] } cseq = { version ="0.1", path = "../cseq" } bitm = { version="0.4", path="../bitm", features=["aligned-vec"] } sucds = "0.8" @@ -23,4 +23,4 @@ succinct = "0.5" vers-vecs = { version="1.1", optional=true } sux="0.3" mem_dbg = "0.1" # required by sux MemSize -aligned-vec = "0.5" \ No newline at end of file +aligned-vec = "0.6" \ No newline at end of file diff --git a/cseq_benchmark/src/elias_fano.rs b/cseq_benchmark/src/elias_fano.rs index 0307c23..2444625 100644 --- a/cseq_benchmark/src/elias_fano.rs +++ b/cseq_benchmark/src/elias_fano.rs @@ -7,7 +7,7 @@ use bitm::{Rank, Select}; pub fn benchmark(conf: &super::Conf) { println!("cseq Elias-Fano"); - let mut builder = Builder::>::new_b(conf.num(), conf.universe as u64); + let mut builder = Builder::>::new_b(conf.num(), conf.universe as u64); let tester = conf.add_data(|v| builder.push(v as u64)); //let start_moment = Instant::now(); diff --git a/csf_benchmark/Cargo.toml b/csf_benchmark/Cargo.toml index 496881f..fbbea32 100644 --- a/csf_benchmark/Cargo.toml +++ b/csf_benchmark/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "csf_benchmark" -version = "0.1.5" +version = "0.1.6" authors = ["Piotr Beling "] edition = "2021" license = "MIT OR Apache-2.0" @@ -13,7 +13,7 @@ categories = [ "data-structures", "algorithms", "compression", "science" ] keywords = [ "perfect", "hashing", "mphf", "map", "dictionary" ] [dependencies] -csf = { version ="0.1", path = "../csf" } +csf = { version ="0.2", path = "../csf" } ph = { version="0.8", path="../ph", features = ["wyhash"] } clap = { version="4", features = ["derive"] } #fsum = { version ="0.1", path = "../fsum" } \ No newline at end of file diff --git a/dyn_size_of/Cargo.toml b/dyn_size_of/Cargo.toml index 6e33935..77096e9 100644 --- a/dyn_size_of/Cargo.toml +++ b/dyn_size_of/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dyn_size_of" -version = "0.4.2" +version = "0.4.3" edition = "2021" authors = ["Piotr Beling "] license = "MIT OR Apache-2.0" @@ -13,4 +13,4 @@ categories = [ "data-structures", "science" ] keywords = [ "memory", "complexity", "heap" ] [dependencies] -aligned-vec = { version="0.5", optional=true } \ No newline at end of file +aligned-vec = { version=">=0.5", optional=true } \ No newline at end of file diff --git a/dyn_size_of/src/lib.rs b/dyn_size_of/src/lib.rs index a3bbe03..b0fdebc 100644 --- a/dyn_size_of/src/lib.rs +++ b/dyn_size_of/src/lib.rs @@ -105,7 +105,7 @@ impl GetSize for Box<[T]> { impl_getsize_methods_for_dyn_arr!(T); } -#[cfg(feature = "aligned-vec")] impl GetSize for aligned_vec::ABox<[T]> { +#[cfg(feature = "aligned-vec")] impl GetSize for aligned_vec::ABox<[T], A> { impl_getsize_methods_for_dyn_arr!(T); } @@ -135,7 +135,7 @@ impl GetSize for Vec { impl_getsize_methods_for_vec!(T); } -#[cfg(feature = "aligned-vec")] impl GetSize for aligned_vec::AVec { +#[cfg(feature = "aligned-vec")] impl GetSize for aligned_vec::AVec { impl_getsize_methods_for_vec!(T); }