fix benches compilation

Author: sebcrozet

Cargo.toml

@@ -114,7 +114,6 @@ encase = { version = "0.12", optional = true }
 [dev-dependencies]
 serde_json = "1.0"
 rand_xorshift = "0.5"
-rand_isaac = "0.5"
 criterion = { version = "0.7", features = ["html_reports"] }
 nalgebra = { path = ".", features = ["debug", "compare", "rand", "macros"] }
 

benches/common/macros.rs

@@ -11,7 +11,7 @@ macro_rules! bench_binop(
             use rand::SeedableRng;
             use rand::RngExt;
 
-            let mut rng = IsaacRng::seed_from_u64(0);
+            let mut rng = XorShiftRng::seed_from_u64(0);
 
             bh.bench_function(stringify!($name), |bh| bh.iter_batched(
                 || (rng.random::<$t1>(), rng.random::<$t2>()),
@@ -30,7 +30,7 @@ macro_rules! bench_binop_ref(
             use rand::SeedableRng;
             use rand::RngExt;
 
-            let mut rng = IsaacRng::seed_from_u64(0);
+            let mut rng = XorShiftRng::seed_from_u64(0);
 
             bh.bench_function(stringify!($name), |bh| bh.iter_batched_ref(
                 || (rng.random::<$t1>(), rng.random::<$t2>()),
@@ -55,7 +55,7 @@ macro_rules! bench_binop_single_1st(
             use rand::RngExt;
             use std::hint::black_box;
 
-            let mut rng = IsaacRng::seed_from_u64(0);
+            let mut rng = XorShiftRng::seed_from_u64(0);
 
             let first = black_box(rng.random::<$t1>());
 
@@ -77,7 +77,7 @@ macro_rules! bench_binop_single_1st_ref(
             use rand::RngExt;
             use std::hint::black_box;
 
-            let mut rng = IsaacRng::seed_from_u64(0);
+            let mut rng = XorShiftRng::seed_from_u64(0);
 
             let first = black_box(rng.random::<$t1>());
 
@@ -98,7 +98,7 @@ macro_rules! bench_unop(
             use rand::SeedableRng;
             use rand::RngExt;
 
-            let mut rng = IsaacRng::seed_from_u64(0);
+            let mut rng = XorShiftRng::seed_from_u64(0);
 
             bh.bench_function(stringify!($name), |bh| bh.iter_batched_ref(
                 || rng.random::<$t>(),

benches/core/matrix.rs

@@ -1,6 +1,5 @@
 use na::{DMatrix, DVector, Matrix2, Matrix3, Matrix4, OMatrix, U10, Vector2, Vector3, Vector4};
-use rand::Rng;
-use rand_isaac::IsaacRng;
+use rand_xorshift::XorShiftRng;
 use std::hint::black_box;
 use std::ops::{Add, Div, Mul, Sub};
 

benches/core/vector.rs

@@ -1,6 +1,6 @@
 use na::{DVector, SVector, Vector2, Vector3, Vector4};
-use rand::{Rng, RngExt};
-use rand_isaac::IsaacRng;
+use rand::RngExt;
+use rand_xorshift::XorShiftRng;
 
 use std::ops::{Add, Div, Mul, Sub};
 
@@ -51,7 +51,7 @@ bench_binop_ref!(vec10000_dot_f32, SVector<f32, 10000>, SVector<f32, 10000>, dot
 fn vec10000_axpy_f64(bh: &mut criterion::Criterion) {
     use rand::SeedableRng;
 
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
 
     bh.bench_function("vec10000_axpy_f64", |bh| {
         bh.iter_batched(
@@ -74,7 +74,7 @@ fn vec10000_axpy_f64(bh: &mut criterion::Criterion) {
 fn vec10000_axpy_beta_f64(bh: &mut criterion::Criterion) {
     use rand::SeedableRng;
 
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
 
     bh.bench_function("vec10000_axpy_beta_f64", |bh| {
         bh.iter_batched(
@@ -98,7 +98,7 @@ fn vec10000_axpy_beta_f64(bh: &mut criterion::Criterion) {
 fn vec10000_axpy_f64_slice(bh: &mut criterion::Criterion) {
     use rand::SeedableRng;
 
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
 
     bh.bench_function("vec10000_axpy_f64_slice", |bh| {
         bh.iter_batched(
@@ -123,7 +123,7 @@ fn vec10000_axpy_f64_slice(bh: &mut criterion::Criterion) {
 fn vec10000_axpy_f64_static(bh: &mut criterion::Criterion) {
     use rand::SeedableRng;
 
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
 
     // NOTE: for some reasons, it is much faster if the argument are boxed (Box::new(OVector...)).
     bh.bench_function("vec10000_axpy_f64_static", |bh| {
@@ -147,7 +147,7 @@ fn vec10000_axpy_f64_static(bh: &mut criterion::Criterion) {
 fn vec10000_axpy_f32(bh: &mut criterion::Criterion) {
     use rand::SeedableRng;
 
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
 
     bh.bench_function("vec10000_axpy_f32", |bh| {
         bh.iter_batched(
@@ -170,7 +170,7 @@ fn vec10000_axpy_f32(bh: &mut criterion::Criterion) {
 fn vec10000_axpy_beta_f32(bh: &mut criterion::Criterion) {
     use rand::SeedableRng;
 
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
 
     bh.bench_function("vec10000_axpy_beta_f32", |bh| {
         bh.iter_batched(

benches/geometry/quaternion.rs

@@ -1,6 +1,5 @@
 use na::{Quaternion, UnitQuaternion, Vector3};
-use rand::Rng;
-use rand_isaac::IsaacRng;
+use rand_xorshift::XorShiftRng;
 use std::ops::{Add, Div, Mul, Sub};
 
 #[path = "../common/macros.rs"]

benches/lib.rs

@@ -7,9 +7,9 @@ extern crate rand_package as rand;
 extern crate criterion;
 
 use na::{DMatrix, SMatrix, Scalar};
+use rand::RngExt;
 use rand::distr::{Distribution, StandardUniform};
-use rand::{Rng, RngExt};
-use rand_isaac::IsaacRng;
+use rand_xorshift::XorShiftRng;
 
 pub mod core;
 pub mod geometry;
@@ -22,14 +22,14 @@ where
     StandardUniform: Distribution<T>,
 {
     use rand::SeedableRng;
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
     SMatrix::from_fn(|_, _| rng.random())
 }
 
 #[allow(dead_code)]
 fn reproducible_dmatrix(nrows: usize, ncols: usize) -> DMatrix<f64> {
     use rand::SeedableRng;
-    let mut rng = IsaacRng::seed_from_u64(0);
+    let mut rng = XorShiftRng::seed_from_u64(0);
     DMatrix::<f64>::from_fn(nrows, ncols, |_, _| rng.random())
 }