Skip to content

Commit

Permalink
Remove SmallRng::from_thread_rng (rust-random#1532)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhardy
dhardy authored Nov 22, 2024
1 parent cd9d989 commit 0692e7d
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
12 changes: 6 additions & 6 deletions benches/distr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const ITER_ELTS: u64 = 100;
macro_rules! distr_int {
($group:ident, $fnn:expr, $ty:ty, $distr:expr) => {
$group.bench_function($fnn, |c| {
let mut rng = Pcg64Mcg::from_os_rng();
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());
let distr = $distr;

c.iter(|| distr.sample(&mut rng));
Expand All @@ -36,7 +36,7 @@ macro_rules! distr_int {
macro_rules! distr_float {
($group:ident, $fnn:expr, $ty:ty, $distr:expr) => {
$group.bench_function($fnn, |c| {
let mut rng = Pcg64Mcg::from_os_rng();
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());
let distr = $distr;

c.iter(|| Distribution::<$ty>::sample(&distr, &mut rng));
Expand All @@ -47,7 +47,7 @@ macro_rules! distr_float {
macro_rules! distr_arr {
($group:ident, $fnn:expr, $ty:ty, $distr:expr) => {
$group.bench_function($fnn, |c| {
let mut rng = Pcg64Mcg::from_os_rng();
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());
let distr = $distr;

c.iter(|| Distribution::<$ty>::sample(&distr, &mut rng));
Expand Down Expand Up @@ -76,7 +76,7 @@ fn bench(c: &mut Criterion<CyclesPerByte>) {
g.throughput(Throughput::Elements(ITER_ELTS));
g.bench_function("iter", |c| {
use core::f64::consts::{E, PI};
let mut rng = Pcg64Mcg::from_os_rng();
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());
let distr = Normal::new(-E, PI).unwrap();

c.iter(|| {
Expand Down Expand Up @@ -145,7 +145,7 @@ fn bench(c: &mut Criterion<CyclesPerByte>) {
}
g.throughput(Throughput::Elements(ITER_ELTS));
g.bench_function("variable", |c| {
let mut rng = Pcg64Mcg::from_os_rng();
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());
let ldistr = Uniform::new(0.1, 10.0).unwrap();

c.iter(|| {
Expand All @@ -165,7 +165,7 @@ fn bench(c: &mut Criterion<CyclesPerByte>) {

let mut g = c.benchmark_group("bernoulli");
g.bench_function("bernoulli", |c| {
let mut rng = Pcg64Mcg::from_os_rng();
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());
let distr = Bernoulli::new(0.18).unwrap();
c.iter(|| distr.sample(&mut rng))
});
Expand Down
60 changes: 30 additions & 30 deletions benches/generators.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ pub fn random_bytes(c: &mut Criterion) {
}

bench(&mut g, "step", StepRng::new(0, 1));
bench(&mut g, "pcg32", Pcg32::from_os_rng());
bench(&mut g, "pcg64", Pcg64::from_os_rng());
bench(&mut g, "pcg64mcg", Pcg64Mcg::from_os_rng());
bench(&mut g, "pcg64dxsm", Pcg64Dxsm::from_os_rng());
bench(&mut g, "chacha8", ChaCha8Rng::from_os_rng());
bench(&mut g, "chacha12", ChaCha12Rng::from_os_rng());
bench(&mut g, "chacha20", ChaCha20Rng::from_os_rng());
bench(&mut g, "std", StdRng::from_os_rng());
bench(&mut g, "small", SmallRng::from_thread_rng());
bench(&mut g, "pcg32", Pcg32::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64", Pcg64::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64mcg", Pcg64Mcg::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64dxsm", Pcg64Dxsm::from_rng(&mut rand::rng()));
bench(&mut g, "chacha8", ChaCha8Rng::from_rng(&mut rand::rng()));
bench(&mut g, "chacha12", ChaCha12Rng::from_rng(&mut rand::rng()));
bench(&mut g, "chacha20", ChaCha20Rng::from_rng(&mut rand::rng()));
bench(&mut g, "std", StdRng::from_rng(&mut rand::rng()));
bench(&mut g, "small", SmallRng::from_rng(&mut rand::rng()));
bench(&mut g, "os", UnwrapErr(OsRng));
bench(&mut g, "thread", rand::rng());

Expand All @@ -69,15 +69,15 @@ pub fn random_u32(c: &mut Criterion) {
}

bench(&mut g, "step", StepRng::new(0, 1));
bench(&mut g, "pcg32", Pcg32::from_os_rng());
bench(&mut g, "pcg64", Pcg64::from_os_rng());
bench(&mut g, "pcg64mcg", Pcg64Mcg::from_os_rng());
bench(&mut g, "pcg64dxsm", Pcg64Dxsm::from_os_rng());
bench(&mut g, "chacha8", ChaCha8Rng::from_os_rng());
bench(&mut g, "chacha12", ChaCha12Rng::from_os_rng());
bench(&mut g, "chacha20", ChaCha20Rng::from_os_rng());
bench(&mut g, "std", StdRng::from_os_rng());
bench(&mut g, "small", SmallRng::from_thread_rng());
bench(&mut g, "pcg32", Pcg32::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64", Pcg64::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64mcg", Pcg64Mcg::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64dxsm", Pcg64Dxsm::from_rng(&mut rand::rng()));
bench(&mut g, "chacha8", ChaCha8Rng::from_rng(&mut rand::rng()));
bench(&mut g, "chacha12", ChaCha12Rng::from_rng(&mut rand::rng()));
bench(&mut g, "chacha20", ChaCha20Rng::from_rng(&mut rand::rng()));
bench(&mut g, "std", StdRng::from_rng(&mut rand::rng()));
bench(&mut g, "small", SmallRng::from_rng(&mut rand::rng()));
bench(&mut g, "os", UnwrapErr(OsRng));
bench(&mut g, "thread", rand::rng());

Expand All @@ -98,15 +98,15 @@ pub fn random_u64(c: &mut Criterion) {
}

bench(&mut g, "step", StepRng::new(0, 1));
bench(&mut g, "pcg32", Pcg32::from_os_rng());
bench(&mut g, "pcg64", Pcg64::from_os_rng());
bench(&mut g, "pcg64mcg", Pcg64Mcg::from_os_rng());
bench(&mut g, "pcg64dxsm", Pcg64Dxsm::from_os_rng());
bench(&mut g, "chacha8", ChaCha8Rng::from_os_rng());
bench(&mut g, "chacha12", ChaCha12Rng::from_os_rng());
bench(&mut g, "chacha20", ChaCha20Rng::from_os_rng());
bench(&mut g, "std", StdRng::from_os_rng());
bench(&mut g, "small", SmallRng::from_thread_rng());
bench(&mut g, "pcg32", Pcg32::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64", Pcg64::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64mcg", Pcg64Mcg::from_rng(&mut rand::rng()));
bench(&mut g, "pcg64dxsm", Pcg64Dxsm::from_rng(&mut rand::rng()));
bench(&mut g, "chacha8", ChaCha8Rng::from_rng(&mut rand::rng()));
bench(&mut g, "chacha12", ChaCha12Rng::from_rng(&mut rand::rng()));
bench(&mut g, "chacha20", ChaCha20Rng::from_rng(&mut rand::rng()));
bench(&mut g, "std", StdRng::from_rng(&mut rand::rng()));
bench(&mut g, "small", SmallRng::from_rng(&mut rand::rng()));
bench(&mut g, "os", UnwrapErr(OsRng));
bench(&mut g, "thread", rand::rng());

Expand All @@ -120,7 +120,7 @@ pub fn init_gen(c: &mut Criterion) {

fn bench<R: SeedableRng>(g: &mut BenchmarkGroup<WallTime>, name: &str) {
g.bench_function(name, |b| {
let mut rng = Pcg32::from_os_rng();
let mut rng = Pcg32::from_rng(&mut rand::rng());
b.iter(|| R::from_rng(&mut rng));
});
}
Expand All @@ -145,7 +145,7 @@ pub fn init_from_u64(c: &mut Criterion) {

fn bench<R: SeedableRng>(g: &mut BenchmarkGroup<WallTime>, name: &str) {
g.bench_function(name, |b| {
let mut rng = Pcg32::from_os_rng();
let mut rng = Pcg32::from_rng(&mut rand::rng());
let seed = rng.random();
b.iter(|| R::seed_from_u64(black_box(seed)));
});
Expand Down Expand Up @@ -174,7 +174,7 @@ pub fn init_from_seed(c: &mut Criterion) {
rand::distr::StandardUniform: Distribution<<R as SeedableRng>::Seed>,
{
g.bench_function(name, |b| {
let mut rng = Pcg32::from_os_rng();
let mut rng = Pcg32::from_rng(&mut rand::rng());
let seed = rng.random();
b.iter(|| R::from_seed(black_box(seed.clone())));
});
Expand Down
2 changes: 1 addition & 1 deletion benches/standard.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ where
{
g.throughput(criterion::Throughput::Bytes(size_of::<T>() as u64));
g.bench_function(name, |b| {
let mut rng = Pcg64Mcg::from_os_rng();
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());

b.iter(|| rng.sample::<T, _>(D::default()));
});
Expand Down

0 comments on commit 0692e7d

Please sign in to comment.