Skip to content

Update rand to 0.8 #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2021
Merged

Update rand to 0.8 #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion timely/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ futures-util = "0.3"

[dev-dependencies]
# timely_sort="0.1.6"
rand="0.4"
rand = { version = "0.8", features = ["small_rng"] }
7 changes: 3 additions & 4 deletions timely/examples/bfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extern crate timely;

use std::collections::HashMap;

use rand::{Rng, SeedableRng, StdRng};
use rand::{Rng, SeedableRng, rngs::SmallRng};

use timely::dataflow::operators::{ToStream, Concat, Feedback, ConnectLoop};
use timely::dataflow::operators::generic::operator::Operator;
Expand All @@ -21,8 +21,7 @@ fn main() {
let index = worker.index();
let peers = worker.peers();

let seed: &[_] = &[1, 2, 3, index];
let mut rng: StdRng = SeedableRng::from_seed(seed);
let mut rng: SmallRng = SeedableRng::seed_from_u64(index as u64);

// pending edges and node updates.
let mut edge_list = Vec::new();
Expand All @@ -41,7 +40,7 @@ fn main() {

// generate part of a random graph.
let graph = (0..edges / peers)
.map(move |_| (rng.gen_range(0u32, nodes as u32), rng.gen_range(0u32, nodes as u32)))
.map(move |_| (rng.gen_range(0..nodes as u32), rng.gen_range(0..nodes as u32)))
.to_stream(scope);

// define a loop variable, for the (node, worker) pairs.
Expand Down
9 changes: 4 additions & 5 deletions timely/examples/hashjoin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extern crate timely;

use std::collections::HashMap;

use rand::{Rng, SeedableRng, StdRng};
use rand::{Rng, SeedableRng, rngs::SmallRng};

use timely::dataflow::*;
use timely::dataflow::operators::{Input, Probe};
Expand Down Expand Up @@ -79,8 +79,7 @@ fn main() {
.probe_with(&mut probe);
});

let seed: &[_] = &[1, 2, 3, index];
let mut rng: StdRng = SeedableRng::from_seed(seed);
let mut rng: SmallRng = SeedableRng::seed_from_u64(index as u64);

let timer = std::time::Instant::now();

Expand All @@ -90,8 +89,8 @@ fn main() {
// Send some amount of data, no more than `batch`.
let to_send = std::cmp::min(batch, vals/peers - sent);
for _ in 0 .. to_send {
input1.send((rng.gen_range(0, keys), rng.gen_range(0, keys)));
input2.send((rng.gen_range(0, keys), rng.gen_range(0, keys)));
input1.send((rng.gen_range(0..keys), rng.gen_range(0..keys)));
input2.send((rng.gen_range(0..keys), rng.gen_range(0..keys)));
}
sent += to_send;

Expand Down
13 changes: 6 additions & 7 deletions timely/examples/pagerank.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ extern crate rand;
extern crate timely;

use std::collections::HashMap;
use rand::{Rng, SeedableRng, StdRng};
use rand::{Rng, SeedableRng, rngs::SmallRng};

use timely::dataflow::{InputHandle, ProbeHandle};
use timely::dataflow::operators::{Feedback, ConnectLoop, Probe};
Expand Down Expand Up @@ -161,12 +161,11 @@ fn main() {
let nodes: usize = std::env::args().nth(1).unwrap().parse().unwrap();
let edges: usize = std::env::args().nth(2).unwrap().parse().unwrap();

let seed: &[_] = &[1, 2, 3, worker.index()];
let mut rng1: StdRng = SeedableRng::from_seed(seed);
let mut rng2: StdRng = SeedableRng::from_seed(seed);
let mut rng1: SmallRng = SeedableRng::seed_from_u64(worker.index() as u64);
let mut rng2: SmallRng = SeedableRng::seed_from_u64(worker.index() as u64);

for _ in 0 .. edges / worker.peers() {
input.send(((rng1.gen_range(0, nodes), rng1.gen_range(0, nodes)), 1));
input.send(((rng1.gen_range(0..nodes), rng1.gen_range(0..nodes)), 1));
}

input.advance_to(1);
Expand All @@ -176,8 +175,8 @@ fn main() {
}

for i in 1 .. 1000 {
input.send(((rng1.gen_range(0, nodes), rng1.gen_range(0, nodes)), 1));
input.send(((rng2.gen_range(0, nodes), rng2.gen_range(0, nodes)), -1));
input.send(((rng1.gen_range(0..nodes), rng1.gen_range(0..nodes)), 1));
input.send(((rng2.gen_range(0..nodes), rng2.gen_range(0..nodes)), -1));
input.advance_to(i + 1);
while probe.less_than(input.time()) {
worker.step();
Expand Down
7 changes: 3 additions & 4 deletions timely/examples/unionfind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extern crate timely;

use std::cmp::Ordering;

use rand::{Rng, SeedableRng, StdRng};
use rand::{Rng, SeedableRng, rngs::SmallRng};

use timely::dataflow::*;
use timely::dataflow::operators::{Input, Exchange, Probe};
Expand Down Expand Up @@ -34,11 +34,10 @@ fn main() {
.probe_with(&mut probe);
});

let seed: &[_] = &[1, 2, 3, index];
let mut rng: StdRng = SeedableRng::from_seed(seed);
let mut rng: SmallRng = SeedableRng::seed_from_u64(index as u64);

for edge in 0..(edges / peers) {
input.send((rng.gen_range(0, nodes), rng.gen_range(0, nodes)));
input.send((rng.gen_range(0..nodes), rng.gen_range(0..nodes)));
if edge % batch == (batch - 1) {
let next = input.epoch() + 1;
input.advance_to(next);
Expand Down