Moved visits to webgraph from webgraph_algo

zommiommy · zommiommy · commit db38311e0a2a · 2025-07-01T18:34:59.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,6 +36,8 @@ serde_json = "1.0.137"
 zstd = "0.13"
 value-traits = "0.1.4"
 thiserror = "2.0.12"
+no-break = "0.1.2"
+nonmax = "0.5.5"
 
 [profile.release]
 opt-level = 3 # like --release
diff --git a/algo/Cargo.toml b/algo/Cargo.toml
@@ -30,12 +30,11 @@ rand.workspace = true
 log.workspace = true
 rayon.workspace = true
 sync-cell-slice.workspace = true
+no-break.workspace = true
+nonmax.workspace = true
 
-nonmax = "0.5.5"
 sealed = "0.6.0"
 thiserror = "2.0.12"
-parallel_frontier = "0.1.1"
-no-break = "0.1.2"
 kahan = "0.1.4"
 
 [features]
diff --git a/algo/src/acyclicity.rs b/algo/src/acyclicity.rs
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  */
 
-use crate::{
-    visits::depth_first::{EventPred, SeqPath},
-    visits::{Sequential, StoppedWhenDone},
-};
 use dsi_progress_logger::prelude::*;
 use std::ops::ControlFlow::{Break, Continue};
 use webgraph::traits::RandomAccessGraph;
+use webgraph::{
+    visits::depth_first::{EventPred, SeqPath},
+    visits::{Sequential, StoppedWhenDone},
+};
 
 /// Returns whether the graph is acyclic.
 ///
diff --git a/algo/src/distances/exact_sum_sweep/computer.rs b/algo/src/distances/exact_sum_sweep/computer.rs
@@ -9,10 +9,6 @@ use crate::{
     distances::exact_sum_sweep::scc_graph::SccGraph,
     sccs::{self, Sccs},
     utils::math,
-    visits::{
-        breadth_first::{EventNoPred, ParFairNoPred},
-        FilterArgs, Parallel,
-    },
 };
 use dsi_progress_logger::*;
 use no_break::NoBreak;
@@ -28,6 +24,10 @@ use std::{
 use sux::bits::AtomicBitVec;
 use sync_cell_slice::SyncSlice;
 use webgraph::traits::RandomAccessGraph;
+use webgraph::visits::{
+    breadth_first::{EventNoPred, ParFairNoPred},
+    FilterArgs, Parallel,
+};
 
 use super::{Level, Missing};
 
diff --git a/algo/src/lib.rs b/algo/src/lib.rs
@@ -19,13 +19,9 @@ pub mod sccs;
 mod top_sort;
 pub use top_sort::top_sort;
 pub mod distances;
-pub mod visits;
 pub mod prelude {
     pub use crate::acyclicity::is_acyclic;
     pub use crate::sccs::*;
     pub use crate::thread_pool;
     pub use crate::top_sort::top_sort;
-    pub use crate::visits::breadth_first;
-    pub use crate::visits::depth_first;
-    pub use crate::visits::*;
 }
diff --git a/algo/src/sccs/kosaraju.rs b/algo/src/sccs/kosaraju.rs
@@ -6,14 +6,15 @@
  */
 
 use super::Sccs;
-use crate::{
-    prelude::*,
-    visits::depth_first::{EventNoPred, SeqNoPred},
-};
+use crate::prelude::*;
 use dsi_progress_logger::ProgressLog;
 use no_break::NoBreak;
 use std::ops::ControlFlow::Continue;
 use webgraph::traits::RandomAccessGraph;
+use webgraph::visits::{
+    depth_first::{EventNoPred, SeqNoPred},
+    Sequential,
+};
 
 /// Computes the strongly connected components of a graph using Kosaraju's algorithm.
 ///
diff --git a/algo/src/sccs/symm_par.rs b/algo/src/sccs/symm_par.rs
@@ -5,10 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  */
 
-use crate::{
-    prelude::*,
-    visits::breadth_first::{EventNoPred, ParFairNoPred},
-};
+use crate::prelude::*;
 use dsi_progress_logger::ConcurrentProgressLog;
 use no_break::NoBreak;
 use rayon::ThreadPool;
@@ -19,6 +16,10 @@ use std::{
 };
 use sync_cell_slice::SyncSlice;
 use webgraph::traits::RandomAccessGraph;
+use webgraph::visits::{
+    breadth_first::{EventNoPred, ParFairNoPred},
+    Parallel,
+};
 
 /// Connected components of symmetric graphs by parallel visits.
 pub fn symm_par(
diff --git a/algo/src/sccs/symm_seq.rs b/algo/src/sccs/symm_seq.rs
@@ -6,11 +6,11 @@
  */
 
 use super::Sccs;
-use crate::prelude::*;
 use dsi_progress_logger::ProgressLog;
 use no_break::NoBreak;
 use std::ops::ControlFlow::Continue;
 use webgraph::traits::RandomAccessGraph;
+use webgraph::{prelude::*, visits::Sequential};
 
 /// Connected components of symmetric graphs by sequential visits.
 pub fn symm_seq(graph: impl RandomAccessGraph, pl: &mut impl ProgressLog) -> Sccs {
diff --git a/algo/src/sccs/tarjan.rs b/algo/src/sccs/tarjan.rs
@@ -6,11 +6,11 @@
  */
 
 use super::Sccs;
-use crate::visits::{depth_first::*, Sequential, StoppedWhenDone};
 use dsi_progress_logger::ProgressLog;
 use std::ops::ControlFlow::{Break, Continue};
 use sux::bits::BitVec;
 use webgraph::traits::RandomAccessGraph;
+use webgraph::visits::{depth_first::*, Sequential, StoppedWhenDone};
 
 /// Tarjan's algorithm for strongly connected components.
 pub fn tarjan(graph: impl RandomAccessGraph, pl: &mut impl ProgressLog) -> Sccs {
diff --git a/algo/src/top_sort.rs b/algo/src/top_sort.rs
@@ -5,14 +5,14 @@
  * SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  */
 
-use crate::{
-    visits::depth_first::SeqPred,
-    visits::{depth_first::*, Sequential},
-};
 use dsi_progress_logger::ProgressLog;
 use no_break::NoBreak;
 use std::ops::ControlFlow::Continue;
 use webgraph::traits::RandomAccessGraph;
+use webgraph::{
+    visits::depth_first::SeqPred,
+    visits::{depth_first::*, Sequential},
+};
 
 /// Returns the node of the graph in topological-sort order, if the graph is
 /// acyclic.
diff --git a/algo/tests/test_asyc_top_sort.rs b/algo/tests/test_asyc_top_sort.rs
@@ -8,10 +8,8 @@
 use dsi_progress_logger::no_logging;
 use no_break::NoBreak;
 use webgraph::prelude::VecGraph;
-use webgraph_algo::{
-    prelude::{depth_first, is_acyclic, top_sort},
-    visits::Sequential,
-};
+use webgraph::visits::{depth_first, Sequential};
+use webgraph_algo::prelude::{is_acyclic, top_sort};
 
 #[test]
 fn test_top_sort() {
diff --git a/algo/tests/test_exact_sum_sweep.rs b/algo/tests/test_exact_sum_sweep.rs
@@ -16,10 +16,10 @@ use webgraph::graphs::vec_graph::VecGraph;
 use webgraph::prelude::BTreeGraph;
 use webgraph::traits::SequentialLabeling;
 use webgraph::transform::transpose;
+use webgraph::visits::breadth_first::{EventPred, Seq};
+use webgraph::visits::Sequential;
 use webgraph_algo::distances::exact_sum_sweep::*;
-use webgraph_algo::prelude::breadth_first::{EventPred, Seq};
 use webgraph_algo::thread_pool;
-use webgraph_algo::visits::Sequential;
 
 #[test]
 fn test_path() -> Result<()> {
diff --git a/cli/src/perm/bfs.rs b/cli/src/perm/bfs.rs
@@ -68,7 +68,7 @@ where
     // create the permutation
     let mut perm = vec![0; graph.num_nodes()];
     pl.start("Computing BFS permutation...");
-    let mut visit = webgraph_algo::visits::breadth_first::Seq::new(&graph);
+    let mut visit = webgraph::visits::breadth_first::Seq::new(&graph);
     for (i, event) in visit.into_iter().enumerate() {
         perm[event.node] = i;
         pl.light_update();
diff --git a/webgraph/Cargo.toml b/webgraph/Cargo.toml
@@ -46,6 +46,8 @@ java-properties.workspace = true
 sync-cell-slice.workspace = true
 arbitrary = { workspace = true, optional = true }
 thiserror.workspace = true
+no-break.workspace = true
+nonmax.workspace = true
 
 libc = "0.2.155"
 impl-tools = "0.11.2"
@@ -56,6 +58,7 @@ rdst = { version = "0.20.14", features = ["multi-threaded"] }
 sealed = "0.6.0"
 serde = { workspace = true, optional = true }
 crossbeam-channel = "0.5"
+parallel_frontier = "0.1.1"
 
 # Fuzzing deps
 zip = { version = "4.0.0", optional = true }
diff --git a/webgraph/src/lib.rs b/webgraph/src/lib.rs
@@ -24,11 +24,14 @@ pub mod labels;
 pub mod traits;
 pub mod transform;
 pub mod utils;
+pub mod visits;
 
 pub mod prelude {
     pub use crate::graphs::prelude::*;
     pub use crate::labels::*;
     pub use crate::traits::*;
     pub use crate::transform::*;
     pub use crate::utils::*;
+    pub use crate::visits::breadth_first;
+    pub use crate::visits::depth_first;
 }
diff --git a/webgraph/src/visits/breadth_first/mod.rs b/webgraph/src/visits/breadth_first/mod.rs
diff --git a/webgraph/src/visits/breadth_first/par_fair.rs b/webgraph/src/visits/breadth_first/par_fair.rs
@@ -6,14 +6,14 @@
  */
 
 use crate::visits::{breadth_first::*, Parallel};
+use crate::{traits::RandomAccessGraph, utils::Granularity};
 use parallel_frontier::Frontier;
 use rayon::{prelude::*, ThreadPool};
 use std::{
     ops::ControlFlow::{self, Continue},
     sync::atomic::Ordering,
 };
 use sux::bits::AtomicBitVec;
-use webgraph::{traits::RandomAccessGraph, utils::Granularity};
 
 /// Fair parallel breadth-first visits.
 ///
diff --git a/webgraph/src/visits/breadth_first/par_low_mem.rs b/webgraph/src/visits/breadth_first/par_low_mem.rs
@@ -9,14 +9,14 @@ use crate::visits::{
     breadth_first::{EventPred, FilterArgsPred},
     Parallel,
 };
+use crate::{traits::RandomAccessGraph, utils::Granularity};
 use parallel_frontier::Frontier;
 use rayon::{prelude::*, ThreadPool};
 use std::{
     ops::ControlFlow::{self, Continue},
     sync::atomic::Ordering,
 };
 use sux::bits::AtomicBitVec;
-use webgraph::{traits::RandomAccessGraph, utils::Granularity};
 
 /// Low-memory parallel breadth-first visits.
 ///
diff --git a/webgraph/src/visits/breadth_first/seq.rs b/webgraph/src/visits/breadth_first/seq.rs
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  */
 
+use crate::traits::{RandomAccessGraph, RandomAccessLabeling};
 use crate::visits::{
     breadth_first::{EventPred, FilterArgsPred},
     Sequential,
 };
 use nonmax::NonMaxUsize;
 use std::{collections::VecDeque, ops::ControlFlow, ops::ControlFlow::Continue};
 use sux::bits::BitVec;
-use webgraph::traits::{RandomAccessGraph, RandomAccessLabeling};
 
 /// A sequential breadth-first visit.
 ///
diff --git a/webgraph/src/visits/depth_first/mod.rs b/webgraph/src/visits/depth_first/mod.rs
diff --git a/webgraph/src/visits/depth_first/seq.rs b/webgraph/src/visits/depth_first/seq.rs
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  */
 
+use crate::traits::{RandomAccessGraph, RandomAccessLabeling};
 use crate::visits::{
     depth_first::{EventNoPred, EventPred, FilterArgsNoPred, FilterArgsPred},
     Sequential,
 };
 use sealed::sealed;
 use std::ops::ControlFlow::{self, Continue};
 use sux::bits::BitVec;
-use webgraph::traits::{RandomAccessGraph, RandomAccessLabeling};
 
 /// A depth-first visit which does not keep track of predecessors, or nodes on the stack.
 pub type SeqNoPred<'a, G> = SeqIter<'a, TwoStates, G, (), false>;
diff --git a/webgraph/src/visits/mod.rs b/webgraph/src/visits/mod.rs
diff --git a/webgraph/tests/test_breadth_first.rs b/webgraph/tests/test_breadth_first.rs
@@ -10,13 +10,13 @@ use no_break::NoBreak;
 use std::ops::ControlFlow::Continue;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use sync_cell_slice::SyncSlice;
+use webgraph::prelude::*;
+use webgraph::thread_pool;
 use webgraph::utils::Granularity;
 use webgraph::{
     prelude::{BvGraph, VecGraph},
     traits::{RandomAccessGraph, SequentialLabeling},
 };
-use webgraph_algo::prelude::*;
-use webgraph_algo::thread_pool;
 
 fn correct_distances<G: RandomAccessGraph>(graph: &G, start: usize) -> Vec<usize> {
     let mut distances = Vec::new();
diff --git a/webgraph/tests/test_depth_first.rs b/webgraph/tests/test_depth_first.rs
@@ -7,8 +7,8 @@
  */
 
 use no_break::NoBreak;
+use webgraph::{prelude::depth_first, visits::Sequential};
 use webgraph::{prelude::VecGraph, traits::SequentialLabeling};
-use webgraph_algo::{prelude::depth_first, visits::Sequential};
 
 #[test]
 fn test_depth() {
