diff --git a/crates/bench_util/Cargo.toml b/crates/bench_util/Cargo.toml deleted file mode 100644 index 3317d2d..0000000 --- a/crates/bench_util/Cargo.toml +++ /dev/null @@ -1,22 +0,0 @@ -[package] -name = "bench_util" -version = "0.0.1" -description = "Benchmark utilities." -keywords = ["benchmark", "util", "graph"] -publish = false -authors.workspace = true -rust-version.workspace = true -repository.workspace = true -edition.workspace = true -license.workspace = true - -[dependencies] -async-compression.workspace = true -directories.workspace = true -futures.workspace = true -graph_builder = { path = "../builder", version = "^0.4.0", features = ["dotgraph", "gdl"] } -rand.workspace = true -reqwest.workspace = true -tokio-tar.workspace = true -tokio-util.workspace = true -tokio.workspace = true diff --git a/crates/builder/Cargo.toml b/crates/builder/Cargo.toml index 7eed702..3347a43 100644 --- a/crates/builder/Cargo.toml +++ b/crates/builder/Cargo.toml @@ -30,11 +30,17 @@ rayon.workspace = true thiserror.workspace = true [dev-dependencies] -bench_util = { path = "../bench_util", version = "0.0.1" } +async-compression.workspace = true criterion.workspace = true +directories.workspace = true +futures.workspace = true rand.workspace = true +reqwest.workspace = true tap.workspace = true tempfile.workspace = true +tokio-tar.workspace = true +tokio-util.workspace = true +tokio.workspace = true [features] force_fallback_impl = [] diff --git a/crates/bench_util/src/lib.rs b/crates/builder/benches/common/mod.rs similarity index 100% rename from crates/bench_util/src/lib.rs rename to crates/builder/benches/common/mod.rs diff --git a/crates/builder/benches/dotgraph.rs b/crates/builder/benches/dotgraph.rs index 26b360a..cdadb30 100644 --- a/crates/builder/benches/dotgraph.rs +++ b/crates/builder/benches/dotgraph.rs @@ -1,10 +1,12 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion, SamplingMode}; use graph_builder::prelude::*; -use bench_util::*; use graph_builder::input::dotgraph::{LabelStats, NodeLabelIndex}; use rand::Rng; +mod common; +use common::*; + fn label_stats(c: &mut Criterion) { let mut group = c.benchmark_group("label_stats"); diff --git a/crates/builder/benches/edgelist.rs b/crates/builder/benches/edgelist.rs index 3990cf4..dc1ed96 100644 --- a/crates/builder/benches/edgelist.rs +++ b/crates/builder/benches/edgelist.rs @@ -1,7 +1,8 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion, SamplingMode}; use graph_builder::prelude::*; -use bench_util::*; +mod common; +use common::*; fn max_node_id(c: &mut Criterion) { let mut group = c.benchmark_group("max_node_id"); diff --git a/crates/builder/benches/topology.rs b/crates/builder/benches/topology.rs index d5011f8..8614f28 100644 --- a/crates/builder/benches/topology.rs +++ b/crates/builder/benches/topology.rs @@ -3,9 +3,11 @@ use criterion::*; use graph_builder::graph::csr::Csr; use graph_builder::prelude::*; -use bench_util::*; use graph_builder::graph::adj_list::{AdjacencyList, DirectedALGraph}; +mod common; +use common::*; + fn csr(c: &mut Criterion) { let mut group = c.benchmark_group("csr_from_edge_list"); group.sampling_mode(SamplingMode::Flat);