Bump rand to 0.9.0 and rand_distr to 0.5.0

Author: akern40

Cargo.toml

@@ -96,8 +96,8 @@ num-traits = { version = "0.2", default-features = false }
 num-complex = { version = "0.4", default-features = false }
 approx = { version = "0.5", default-features = false }
 quickcheck = { version = "1.0", default-features = false }
-rand = { version = "0.8.0", features = ["small_rng"] }
-rand_distr = { version = "0.4.0" }
+rand = { version = "0.9.0", features = ["small_rng"] }
+rand_distr = { version = "0.5.0" }
 itertools = { version = "0.13.0", default-features = false, features = ["use_std"] }
 cblas-sys = { version = "0.1.4", default-features = false }
 

ndarray-rand/benches/bench.rs

@@ -13,7 +13,7 @@ use test::Bencher;
 fn uniform_f32(b: &mut Bencher)
 {
     let m = 100;
-    b.iter(|| Array::random((m, m), Uniform::new(-1f32, 1.)));
+    b.iter(|| Array::random((m, m), Uniform::new(-1f32, 1.).unwrap()));
 }
 
 #[bench]

ndarray-rand/src/lib.rs

@@ -29,10 +29,10 @@
 //! that the items are not compatible (e.g. that a type doesn't implement a
 //! necessary trait).
 
-use crate::rand::distributions::{Distribution, Uniform};
+use crate::rand::distr::{Distribution, Uniform};
 use crate::rand::rngs::SmallRng;
 use crate::rand::seq::index;
-use crate::rand::{thread_rng, Rng, SeedableRng};
+use crate::rand::{rng, Rng, SeedableRng};
 
 use ndarray::{Array, Axis, RemoveAxis, ShapeBuilder};
 use ndarray::{ArrayBase, Data, DataOwned, Dimension, RawData};
@@ -71,8 +71,8 @@ where
     /// Create an array with shape `dim` with elements drawn from
     /// `distribution` using the default RNG.
     ///
-    /// ***Panics*** if creation of the RNG fails or if the number of elements
-    /// overflows usize.
+    /// ***Panics*** if creation of the RNG fails, the number of elements
+    /// overflows usize, or the axis has zero length.
     ///
     /// ```
     /// use ndarray::Array;
@@ -95,7 +95,8 @@ where
     /// Create an array with shape `dim` with elements drawn from
     /// `distribution`, using a specific Rng `rng`.
     ///
-    /// ***Panics*** if the number of elements overflows usize.
+    /// ***Panics*** if the number of elements overflows usize
+    /// or the axis has zero length.
     ///
     /// ```
     /// use ndarray::Array;
@@ -270,7 +271,7 @@ where
     {
         let indices: Vec<_> = match strategy {
             SamplingStrategy::WithReplacement => {
-                let distribution = Uniform::from(0..self.len_of(axis));
+                let distribution = Uniform::new(0, self.len_of(axis)).unwrap();
                 (0..n_samples).map(|_| distribution.sample(rng)).collect()
             }
             SamplingStrategy::WithoutReplacement => index::sample(rng, self.len_of(axis), n_samples).into_vec(),
@@ -308,5 +309,5 @@ impl Arbitrary for SamplingStrategy
 
 fn get_rng() -> SmallRng
 {
-    SmallRng::from_rng(thread_rng()).expect("create SmallRng from thread_rng failed")
+    SmallRng::from_rng(&mut rng())
 }

ndarray-rand/tests/tests.rs

@@ -13,7 +13,7 @@ fn test_dim()
     let (mm, nn) = (5, 5);
     for m in 0..mm {
         for n in 0..nn {
-            let a = Array::random((m, n), Uniform::new(0., 2.));
+            let a = Array::random((m, n), Uniform::new(0., 2.).unwrap());
             assert_eq!(a.shape(), &[m, n]);
             assert!(a.iter().all(|x| *x < 2.));
             assert!(a.iter().all(|x| *x >= 0.));
@@ -28,7 +28,7 @@ fn test_dim_f()
     let (mm, nn) = (5, 5);
     for m in 0..mm {
         for n in 0..nn {
-            let a = Array::random((m, n).f(), Uniform::new(0., 2.));
+            let a = Array::random((m, n).f(), Uniform::new(0., 2.).unwrap());
             assert_eq!(a.shape(), &[m, n]);
             assert!(a.iter().all(|x| *x < 2.));
             assert!(a.iter().all(|x| *x >= 0.));
@@ -41,7 +41,7 @@ fn test_dim_f()
 fn sample_axis_on_view()
 {
     let m = 5;
-    let a = Array::random((m, 4), Uniform::new(0., 2.));
+    let a = Array::random((m, 4), Uniform::new(0., 2.).unwrap());
     let _samples = a
         .view()
         .sample_axis(Axis(0), m, SamplingStrategy::WithoutReplacement);
@@ -52,15 +52,15 @@ fn sample_axis_on_view()
 fn oversampling_without_replacement_should_panic()
 {
     let m = 5;
-    let a = Array::random((m, 4), Uniform::new(0., 2.));
+    let a = Array::random((m, 4), Uniform::new(0., 2.).unwrap());
     let _samples = a.sample_axis(Axis(0), m + 1, SamplingStrategy::WithoutReplacement);
 }
 
 quickcheck! {
     #[cfg_attr(miri, ignore)] // Takes an insufferably long time
     fn oversampling_with_replacement_is_fine(m: u8, n: u8) -> TestResult {
         let (m, n) = (m as usize, n as usize);
-        let a = Array::random((m, n), Uniform::new(0., 2.));
+        let a = Array::random((m, n), Uniform::new(0., 2.).unwrap());
         // Higher than the length of both axes
         let n_samples = m + n + 1;
 
@@ -136,7 +136,7 @@ fn is_subset(a: &Array2<f64>, b: &ArrayView1<f64>, axis: Axis) -> bool
 fn sampling_without_replacement_from_a_zero_length_axis_should_panic()
 {
     let n = 5;
-    let a = Array::random((0, n), Uniform::new(0., 2.));
+    let a = Array::random((0, n), Uniform::new(0., 2.).unwrap());
     let _samples = a.sample_axis(Axis(0), 1, SamplingStrategy::WithoutReplacement);
 }
 
@@ -145,6 +145,6 @@ fn sampling_without_replacement_from_a_zero_length_axis_should_panic()
 fn sampling_with_replacement_from_a_zero_length_axis_should_panic()
 {
     let n = 5;
-    let a = Array::random((0, n), Uniform::new(0., 2.));
+    let a = Array::random((0, n), Uniform::new(0., 2.).unwrap());
     let _samples = a.sample_axis(Axis(0), 1, SamplingStrategy::WithReplacement);
 }