Fix: CoW compilation issues

Author: ashvardanian

.vscode/settings.json

@@ -23,10 +23,11 @@
     "rapidfuzz",
     "rfind",
     "Skylake",
+    "stringtape",
     "stringwars",
     "stringzilla",
     "strstr",
     "tfidf",
     "Wunsch"
   ]
-}
+}

Cargo.lock

@@ -13,8 +13,8 @@ categories = ["text-processing", "development-tools::profiling"]
 
 [dependencies]
 criterion = "0.7.0"
-stringtape = "2.3.0"
-stringzilla = { version = "4.2.0", default-features = false }
+stringtape = "2.4.0"
+stringzilla = { version = "4.2.1", default-features = false }
 
 # To use a local version of StringZilla, set the path:
 # stringzilla = { path = "../StringZilla/", features = ["cpus"] }
@@ -90,18 +90,17 @@ version = "1.1.3"
 optional = true
 
 [dependencies.regex]
-version = "1.11.3"
+version = "1.12.1"
 optional = false
 
 [dependencies.rapidfuzz]
 version = "0.5.0"
 optional = true
 
 [dependencies.fork_union]
-version = "2.2.10"
+version = "2.3.0"
 optional = true
 
-
 [dependencies.simhash]
 version = "0.2"
 optional = true
@@ -161,7 +160,6 @@ optional = true
 default-features = false
 features = ["lazy", "strings", "parquet"]
 
-
 [dependencies.zeroize]
 version = "1.8.2"
 optional = true
@@ -193,7 +191,7 @@ optional = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
 perf-event = "0.4"
-libc = "0.2.176"
+libc = "0.2.177"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 gxhash = { version = "3.4.1", optional = true }

Cargo.toml

@@ -357,8 +357,8 @@ cargo install cargo-criterion --locked
 To pull and compile all the dependencies, you can call:
 
 ```bash
-cargo build --all-features                  # to compile everything
-cargo check --all-features --all-targets    # to fail on warnings
+RUSTFLAGS="-C target-cpu=native" cargo build --benches --all-features                  # to compile everything
+RUSTFLAGS="-C target-cpu=native" cargo check --benches --all-features --all-targets    # to fail on warnings
 ```
 
 By default StringWars links `stringzilla` in CPU mode.

README.md

@@ -33,11 +33,11 @@ RUSTFLAGS="-C target-cpu=native" \
     cargo criterion --features bench_find bench_find --jobs $(nproc)
 ```
 "#]
-use std::env;
 use std::hint::black_box;
 use std::time::Duration;
 
 use criterion::{Criterion, Throughput};
+use stringtape::BytesCowsAuto;
 
 use aho_corasick::AhoCorasick;
 use bstr::ByteSlice;
@@ -66,7 +66,7 @@ fn configure_bench() -> Criterion {
 fn bench_substring_forward(
     g: &mut criterion::BenchmarkGroup<'_, criterion::measurement::WallTime>,
     haystack: &[u8],
-    needles: &[&[u8]],
+    needles: &BytesCowsAuto,
 ) {
     g.throughput(Throughput::Bytes(haystack.len() as u64));
 
@@ -75,7 +75,7 @@ fn bench_substring_forward(
     if should_run("substring-forward/stringzilla::find") {
         g.bench_function("stringzilla::find", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let mut pos: usize = 0;
                 while let Some(found) = sz::find(&haystack[pos..], token) {
                     pos += found + token.len();
@@ -89,7 +89,7 @@ fn bench_substring_forward(
     if should_run("substring-forward/memmem::find") {
         g.bench_function("memmem::find", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let mut pos: usize = 0;
                 while let Some(found) = memmem::find(&haystack[pos..], token) {
                     pos += found + token.len();
@@ -103,7 +103,7 @@ fn bench_substring_forward(
     if should_run("substring-forward/memmem::Finder") {
         g.bench_function("memmem::Finder", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let finder = memmem::Finder::new(token);
                 let mut pos: usize = 0;
                 while let Some(found) = finder.find(&haystack[pos..]) {
@@ -118,7 +118,7 @@ fn bench_substring_forward(
     if should_run("substring-forward/std::str::find") {
         g.bench_function("std::str::find", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let mut pos = 0;
                 while let Some(found) = haystack[pos..].find(token) {
                     pos += found + token.len();
@@ -132,7 +132,7 @@ fn bench_substring_forward(
 fn bench_substring_backward(
     g: &mut criterion::BenchmarkGroup<'_, criterion::measurement::WallTime>,
     haystack: &[u8],
-    needles: &[&[u8]],
+    needles: &BytesCowsAuto,
 ) {
     g.throughput(Throughput::Bytes(haystack.len() as u64));
 
@@ -141,7 +141,7 @@ fn bench_substring_backward(
     if should_run("substring-backward/stringzilla::rfind") {
         g.bench_function("stringzilla::rfind", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let mut pos: Option<usize> = Some(haystack.len());
                 while let Some(end) = pos {
                     if let Some(found) = sz::rfind(&haystack[..end], token) {
@@ -159,7 +159,7 @@ fn bench_substring_backward(
     if should_run("substring-backward/memmem::rfind") {
         g.bench_function("memmem::rfind", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let mut pos: Option<usize> = Some(haystack.len());
                 while let Some(end) = pos {
                     if let Some(found) = memmem::rfind(&haystack[..end], token) {
@@ -177,7 +177,7 @@ fn bench_substring_backward(
     if should_run("substring-backward/memmem::FinderRev") {
         g.bench_function("memmem::FinderRev", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let finder = memmem::FinderRev::new(token);
                 let mut pos: Option<usize> = Some(haystack.len());
                 while let Some(end) = pos {
@@ -196,7 +196,7 @@ fn bench_substring_backward(
     if should_run("substring-backward/std::str::rfind") {
         g.bench_function("std::str::rfind", |b| {
             b.iter(|| {
-                let token = black_box(*tokens.next().unwrap());
+                let token = black_box(tokens.next().unwrap());
                 let mut pos: Option<usize> = Some(haystack.len());
                 while let Some(end) = pos {
                     if let Some(found) = haystack[..end].rfind(token) {
@@ -214,7 +214,7 @@ fn bench_substring_backward(
 fn bench_byteset_forward(
     g: &mut criterion::BenchmarkGroup<'_, criterion::measurement::WallTime>,
     haystack: &[u8],
-    needles: &[&[u8]],
+    needles: &BytesCowsAuto,
 ) {
     g.throughput(Throughput::Bytes(3 * haystack.len() as u64));
 

bench_find.rs

@@ -47,7 +47,6 @@ RUSTFLAGS="-C target-cpu=native" \
 use core::convert::TryInto;
 use std::collections::hash_map::DefaultHasher;
 use std::env;
-use std::fs;
 use std::hash::{Hash, Hasher};
 
 use criterion::{Criterion, Throughput};

bench_fingerprints.rs

@@ -34,12 +34,12 @@ use std::hint::black_box;
 use std::sync::Arc;
 
 use criterion::{Criterion, SamplingMode};
+use stringtape::CharsCowsAuto;
 
 use arrow::array::{ArrayRef, LargeStringArray};
 use arrow::compute::{lexsort_to_indices, SortColumn};
 use polars::prelude::*;
 use rayon::prelude::*;
-use stringtape::CharsCowsAuto;
 use stringzilla::sz;
 
 mod utils;
@@ -246,8 +246,9 @@ fn main() {
     if tokens_bytes.is_empty() {
         panic!("No tokens found in the dataset.");
     }
-    // Cast BytesCowsAuto to CharsCowsAuto for UTF-8 string benchmarks (StringTape 2.2+)
-    let tokens = tokens_bytes
+    // Leak BytesCowsAuto to get 'static lifetime, then cast to CharsCowsAuto for UTF-8 string benchmarks
+    let tokens_bytes_static: &'static _ = Box::leak(Box::new(tokens_bytes));
+    let tokens = tokens_bytes_static
         .as_chars()
         .expect("Dataset must be valid UTF-8");
 

bench_sequence.rs

@@ -44,7 +44,6 @@ RUSTFLAGS="-C target-cpu=native" \
 "#]
 use core::convert::TryInto;
 use std::env;
-use std::fs;
 
 use criterion::{Criterion, Throughput};
 use fork_union::count_logical_cores;

bench_similarities.rs

@@ -27,6 +27,7 @@ pub fn reclaim_memory() {
 /// Can be cast to CharsCowsAuto for UTF-8 string benchmarks (StringTape 2.2+).
 /// Supports `STRINGWARS_MAX_TOKENS` to limit the number of tokens loaded.
 /// Logs dataset statistics to stderr.
+#[allow(dead_code)]
 pub fn load_dataset() -> BytesCowsAuto<'static> {
     let dataset_path =
         env::var("STRINGWARS_DATASET").expect("STRINGWARS_DATASET environment variable not set");
@@ -151,6 +152,7 @@ pub fn load_dataset() -> BytesCowsAuto<'static> {
 }
 
 /// Format large numbers with thousand separators for readability
+#[allow(dead_code)]
 fn format_number(n: u64) -> String {
     let s = n.to_string();
     let mut result = String::new();
@@ -222,6 +224,7 @@ pub fn should_run(name: &str) -> bool {
 use std::sync::atomic::{AtomicU64, Ordering};
 
 // Simple SI scaling helper
+#[allow(dead_code)]
 #[cfg(any(
     feature = "bench_similarities",
     feature = "bench_fingerprints",
@@ -242,6 +245,7 @@ fn scale_si(mut v: f64) -> (f64, &'static str) {
     }
 }
 
+#[allow(dead_code)]
 #[cfg(any(
     feature = "bench_similarities",
     feature = "bench_fingerprints",
@@ -260,6 +264,7 @@ fn format_seconds(value: f64) -> String {
     }
 }
 
+#[allow(dead_code)]
 #[cfg(feature = "bench_similarities")]
 pub struct CupsFormatter;
 #[cfg(feature = "bench_similarities")]
@@ -325,6 +330,7 @@ impl ValueFormatter for CupsFormatter {
     }
 }
 
+#[allow(dead_code)]
 #[cfg(feature = "bench_fingerprints")]
 pub struct HashesFormatter;
 #[cfg(feature = "bench_fingerprints")]
@@ -421,6 +427,7 @@ impl ValueFormatter for HashesFormatter {
 
 // Measurement wrappers that mirror WallTime but override formatting.
 
+#[allow(dead_code)]
 #[cfg(feature = "bench_similarities")]
 #[derive(Clone, Default)]
 pub struct CupsWallTime;
@@ -455,6 +462,7 @@ impl Measurement for CupsWallTime {
     }
 }
 
+#[allow(dead_code)]
 #[cfg(feature = "bench_fingerprints")]
 #[derive(Clone, Default)]
 pub struct HashesWallTime;
@@ -490,21 +498,25 @@ impl Measurement for HashesWallTime {
 }
 
 // Global ratio to let the formatter print both hashes/s and bytes/s
+#[allow(dead_code)]
 #[cfg(feature = "bench_fingerprints")]
 static FINGERPRINTS_BYTES_PER_HASH_BITS: AtomicU64 = AtomicU64::new(0);
 
+#[allow(dead_code)]
 #[cfg(feature = "bench_fingerprints")]
 pub fn set_fingerprints_bytes_per_hash(v: f64) {
     FINGERPRINTS_BYTES_PER_HASH_BITS.store(v.to_bits(), Ordering::Relaxed);
 }
 
+#[allow(dead_code)]
 #[cfg(feature = "bench_fingerprints")]
 fn get_bytes_per_hash() -> f64 {
     let bits = FINGERPRINTS_BYTES_PER_HASH_BITS.load(Ordering::Relaxed);
     f64::from_bits(bits)
 }
 
 // Comparisons/sec formatter: k/M/G cmp/s
+#[allow(dead_code)]
 #[cfg(feature = "bench_sequence")]
 pub struct ComparisonsFormatter;
 
@@ -570,6 +582,7 @@ impl ValueFormatter for ComparisonsFormatter {
     }
 }
 
+#[allow(dead_code)]
 #[cfg(feature = "bench_sequence")]
 #[derive(Clone, Default)]
 pub struct ComparisonsWallTime;