Remove explicit dependency on timely_communication where not required

Signed-off-by: Moritz Hoffmann <moritz.hoffmann@inf.ethz.ch>

Cargo.toml

@@ -26,7 +26,6 @@ graph_map = { git = "https://github.com/frankmcsherry/graph-map.git" }
 abomonation = "0.5"
 abomonation_derive = "0.3"
 timely_sort="0.1.6"
-timely_communication = "0.5"
 timely = { git = "https://github.com/frankmcsherry/timely-dataflow" }
 fnv="1.0.2"
 

examples/deals.rs

@@ -10,6 +10,7 @@ use std::time::Instant;
 // use rand::{Rng, SeedableRng, StdRng};
 
 use timely::dataflow::*;
+use timely::dataflow::scopes::ScopeParent;
 
 use differential_dataflow::input::Input;
 use differential_dataflow::Collection;
@@ -23,7 +24,7 @@ use differential_dataflow::trace::implementations::ord::OrdValSpine as DefaultVa
 use differential_dataflow::operators::arrange::TraceAgent;
 use differential_dataflow::operators::arrange::Arranged;
 
-type Arrange<G: Scope, K, V, R> = Arranged<G, K, V, R, TraceAgent<K, V, G::Timestamp, R, DefaultValTrace<K, V, G::Timestamp, R>>>;
+type Arrange<G, K, V, R> = Arranged<G, K, V, R, TraceAgent<K, V, <G as ScopeParent>::Timestamp, R, DefaultValTrace<K, V, <G as ScopeParent>::Timestamp, R>>>;
 
 type Node = u32;
 // type Edge = (Node, Node);
@@ -270,4 +271,4 @@ where G::Timestamp: Lattice+Ord {
                 .distinct()
         }
     )
-}
+}

examples/graspan.rs

@@ -1,17 +1,16 @@
 extern crate indexmap;
 extern crate timely;
-extern crate timely_communication;
 extern crate differential_dataflow;
 
 use std::io::{BufRead, BufReader};
 use std::fs::File;
 
 use indexmap::IndexMap;
 
-use timely_communication::Allocate;
+use timely::Allocate;
 
 use timely::dataflow::Scope;
-use timely::dataflow::scopes::{Root, Child};
+use timely::dataflow::scopes::{ScopeParent, Root, Child};
 use timely::progress::timestamp::RootTimestamp;
 use timely::progress::nested::product::Product;
 use timely::progress::Timestamp;
@@ -78,7 +77,7 @@ use differential_dataflow::operators::arrange::{Arranged, TraceAgent};
 
 type TraceKeyHandle<K,T,R> = TraceAgent<K, (), T, R, OrdKeySpine<K, T, R>>;
 type TraceValHandle<K,V,T,R> = TraceAgent<K, V, T, R, OrdValSpine<K, V, T, R>>;
-type Arrange<G: Scope, K, V, R> = Arranged<G, K, V, R, TraceValHandle<K, V, G::Timestamp, R>>;
+type Arrange<G, K, V, R> = Arranged<G, K, V, R, TraceValHandle<K, V, <G as ScopeParent>::Timestamp, R>>;
 
 /// An evolving set of edges.
 ///
@@ -276,4 +275,4 @@ fn main() {
         if index == 0 { println!("{:?}:\tData loaded", timer.elapsed()); }
 
     }).expect("Timely computation did not complete cleanly");
-}
+}

experiments/Cargo.toml

@@ -8,7 +8,6 @@ core_affinity = "0.5.9"
 rand="0.3.13"
 abomonation = "0.5"
 abomonation_derive = "0.3"
-timely_communication = "0.5"
 timely = { git = "https://github.com/frankmcsherry/timely-dataflow" }
 differential-dataflow = { path = "../" }
 graph_map = { git = "https://github.com/frankmcsherry/graph-map" }

server/Cargo.toml

@@ -9,7 +9,7 @@ path="../"
 [dependencies]
 rand="0.3.13"
 libloading="*"
-timely_communication = "0.5"
+timely_communication = "0.6"
 timely = { git = "https://github.com/frankmcsherry/timely-dataflow" }
 
 #[workspace]
@@ -18,4 +18,4 @@ timely = { git = "https://github.com/frankmcsherry/timely-dataflow" }
 #    "dataflows/degr_dist",
 #    "dataflows/neighborhood",
 #    "dataflows/reachability"
-#]
+#]

src/input.rs

@@ -6,7 +6,7 @@
 //! timely dataflow capabilities, exposing more concurrency to the operator implementations
 //! than are evident from the logical times, which appear to execute in sequence.
 
-use timely_communication::Allocate;
+use timely::Allocate;
 
 use timely::progress::Timestamp;
 use timely::progress::timestamp::RootTimestamp;
@@ -26,10 +26,9 @@ pub trait Input<'a, A: Allocate, T: Timestamp+Ord> {
     ///
     /// ```
     /// extern crate timely;
-    /// extern crate timely_communication;
     /// extern crate differential_dataflow;
     ///
-    /// use timely_communication::Configuration;
+    /// use timely::Configuration;
     /// use differential_dataflow::input::Input;
     ///
     /// fn main() {
@@ -58,10 +57,9 @@ pub trait Input<'a, A: Allocate, T: Timestamp+Ord> {
     ///
     /// ```
     /// extern crate timely;
-    /// extern crate timely_communication;
     /// extern crate differential_dataflow;
     ///
-    /// use timely_communication::Configuration;
+    /// use timely::Configuration;
     /// use differential_dataflow::input::Input;
     ///
     /// fn main() {
@@ -115,10 +113,9 @@ impl<'a, A: Allocate, T: Timestamp+Ord> Input<'a, A, T> for Child<'a, Root<A>, T
 ///
 /// ```
 /// extern crate timely;
-/// extern crate timely_communication;
 /// extern crate differential_dataflow;
 ///
-/// use timely_communication::Configuration;
+/// use timely::Configuration;
 /// use differential_dataflow::input::Input;
 ///
 /// fn main() {

src/lib.rs

@@ -89,7 +89,6 @@ impl<T: timely::ExchangeData + Ord + Debug> Data for T { }
 extern crate fnv;
 extern crate timely;
 extern crate timely_sort;
-extern crate timely_communication;
 
 #[macro_use]
 extern crate abomonation_derive;

src/operators/arrange.rs

@@ -249,10 +249,9 @@ where T: Lattice+Ord+Clone+'static, Tr: TraceReader<K,V,T,R> {
     ///
     /// ```
     /// extern crate timely;
-    /// extern crate timely_communication;
     /// extern crate differential_dataflow;
     ///
-    /// use timely_communication::Configuration;
+    /// use timely::Configuration;
     /// use differential_dataflow::input::Input;
     /// use differential_dataflow::operators::arrange::Arrange;
     /// use differential_dataflow::operators::group::GroupArranged;

tests/bfs.rs

@@ -1,13 +1,12 @@
 extern crate rand;
 extern crate timely;
-extern crate timely_communication;
 extern crate differential_dataflow;
 
 use rand::{Rng, SeedableRng, StdRng};
 
 use std::sync::{Arc, Mutex};
 
-use timely_communication::Configuration;
+use timely::Configuration;
 
 use timely::dataflow::*;
 use timely::dataflow::operators::Capture;
@@ -220,4 +219,4 @@ where G::Timestamp: Lattice+Ord {
              .concat(&nodes)
              .group(|_, s, t| t.push((*s[0].0, 1)))
      })
-}
+}

tests/scc.rs

@@ -1,6 +1,5 @@
 extern crate rand;
 extern crate timely;
-extern crate timely_communication;
 extern crate differential_dataflow;
 
 use rand::{Rng, SeedableRng, StdRng};
@@ -10,7 +9,7 @@ use std::collections::{HashMap, HashSet};
 use std::hash::Hash;
 use std::mem;
 
-use timely_communication::Configuration;
+use timely::Configuration;
 
 use timely::dataflow::*;
 use timely::dataflow::operators::Capture;