Upgrade to rand 0.7.0 (#659)

* upgrade to rand 0.7.0

* move benches to rand_distr

* upgrade rand in numeric-tests too

* not sure why we need extern crate but it seems we do?!

* cargo fmt

* move distributions to rand_distr

* Normal now returns Result

* bump ndarray-rand to 0.10.0

* bump required rust to 1.32 because of getrandom

* rand_distr to dev dependencies

* bump version, add note to readme

* update benches

* fix ndarray-rand edition idioms

* cargo fmt after cargo fix

* note in lib.rs

* Improve formatting

* Mention Rust 1.32 in ndarray-rand changelog

Author: max-sixty

.travis.yml

@@ -4,7 +4,7 @@ sudo: required
 dist: trusty
 matrix:
   include:
-    - rust: 1.31.0
+    - rust: 1.32.0
       env:
        - FEATURES='test docs'
     - rust: stable

ndarray-rand/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ndarray-rand"
-version = "0.9.0"
+version = "0.10.0"
 edition = "2018"
 authors = ["bluss"]
 license = "MIT/Apache-2.0"
@@ -13,9 +13,15 @@ description = "Constructors for randomized arrays. `rand` integration for `ndarr
 keywords = ["multidimensional", "matrix", "rand", "ndarray"]
 
 [dependencies]
-rand = "0.6.0"
 ndarray = { version = "0.12.0", path = ".." }
 
+[dependencies.rand]
+version = "0.7.0"
+features = ["small_rng"]
+
+[dev-dependencies]
+rand_distr = "0.2.1"
+
 [package.metadata.release]
 no-dev-version = true
 

ndarray-rand/README.rst

@@ -1,9 +1,25 @@
 ndarray-rand
 ============
 
+Dependencies
+------------
+
+``ndarray-rand`` depends on ``rand`` 0.7. If you use any other items from
+``rand``, you need to specify a compatible version of ``rand`` in your
+``Cargo.toml``. If you want to use a RNG or distribution from another crate
+with ``ndarray-rand``, you need to make sure that crate also depends on the
+correct version of ``rand``. Otherwise, the compiler will return errors saying
+that the items are not compatible (e.g. that a type doesn't implement a
+necessary trait).
+
 Recent Changes
 --------------
 
+- 0.10.0
+
+  - Require rand 0.7
+  - Require Rust 1.32 or later
+
 - 0.9.0
 
   - Require rand 0.6

ndarray-rand/benches/bench.rs

@@ -1,41 +1,29 @@
 #![feature(test)]
 
-extern crate ndarray;
-extern crate ndarray_rand;
-extern crate rand;
 extern crate test;
 
 use ndarray::Array;
 use ndarray_rand::RandomExt;
 use ndarray_rand::F32;
-use rand::distributions::Normal;
-use rand::distributions::Uniform;
+use rand_distr::Normal;
+use rand_distr::Uniform;
 
 use test::Bencher;
 
 #[bench]
 fn uniform_f32(b: &mut Bencher) {
     let m = 100;
-    b.iter(|| {
-        let a = Array::random((m, m), Uniform::new(-1f32, 1.));
-        a
-    });
+    b.iter(|| Array::random((m, m), Uniform::new(-1f32, 1.)));
 }
 
 #[bench]
 fn norm_f32(b: &mut Bencher) {
     let m = 100;
-    b.iter(|| {
-        let a = Array::random((m, m), F32(Normal::new(0., 1.)));
-        a
-    });
+    b.iter(|| Array::random((m, m), F32(Normal::new(0., 1.).unwrap())));
 }
 
 #[bench]
 fn norm_f64(b: &mut Bencher) {
     let m = 100;
-    b.iter(|| {
-        let a = Array::random((m, m), Normal::new(0., 1.));
-        a
-    });
+    b.iter(|| Array::random((m, m), Normal::new(0., 1.).unwrap()));
 }

ndarray-rand/src/lib.rs

@@ -9,6 +9,14 @@
 //! Constructors for randomized arrays. `rand` integration for `ndarray`.
 //!
 //! See [**`RandomExt`**](trait.RandomExt.html) for usage examples.
+//!
+//! **Note:** `ndarray-rand` depends on `rand` 0.7. If you use any other items
+//! from `rand`, you need to specify a compatible version of `rand` in your
+//! `Cargo.toml`. If you want to use a RNG or distribution from another crate
+//! with `ndarray-rand`, you need to make sure that crate also depends on the
+//! correct version of `rand`. Otherwise, the compiler will return errors
+//! saying that the items are not compatible (e.g. that a type doesn't
+//! implement a necessary trait).
 
 use rand::distributions::Distribution;
 use rand::rngs::SmallRng;

numeric-tests/Cargo.toml

@@ -8,7 +8,11 @@ publish = false
 approx = "0.3.2"
 ndarray = { path = "..", features = ["approx"] }
 ndarray-rand = { path = "../ndarray-rand/" }
-rand = "0.6.0"
+rand_distr = "0.2.1"
+
+[dependencies.rand]
+version = "0.7.0"
+features = ["small_rng"]
 
 [lib]
 test = false

numeric-tests/tests/accuracy.rs

@@ -1,10 +1,11 @@
 extern crate approx;
+extern crate rand_distr;
 extern crate ndarray;
 extern crate ndarray_rand;
 extern crate rand;
 
 use ndarray_rand::{RandomExt, F32};
-use rand::{FromEntropy, Rng};
+use rand::{Rng, SeedableRng};
 use rand::rngs::SmallRng;
 
 use ndarray::prelude::*;
@@ -14,7 +15,7 @@ use ndarray::{
 };
 use ndarray::linalg::general_mat_mul;
 
-use rand::distributions::Normal;
+use rand_distr::Normal;
 
 use approx::{assert_abs_diff_eq, assert_relative_eq};
 
@@ -52,12 +53,12 @@ fn reference_mat_mul<A, S, S2>(lhs: &ArrayBase<S, Ix2>, rhs: &ArrayBase<S2, Ix2>
 fn gen<D>(d: D) -> Array<f32, D>
     where D: Dimension,
 {
-    Array::random(d, F32(Normal::new(0., 1.)))
+    Array::random(d, F32(Normal::new(0., 1.).unwrap()))
 }
 fn gen_f64<D>(d: D) -> Array<f64, D>
     where D: Dimension,
 {
-    Array::random(d, Normal::new(0., 1.))
+    Array::random(d, Normal::new(0., 1.).unwrap())
 }
 
 #[test]

src/lib.rs

@@ -61,7 +61,7 @@
 //!     needs matching memory layout to be efficient (with some exceptions).
 //!   + Efficient floating point matrix multiplication even for very large
 //!     matrices; can optionally use BLAS to improve it further.
-//! - **Requires Rust 1.31**
+//! - **Requires Rust 1.32**
 //!
 //! ## Crate Feature Flags
 //!