Merge branch 'master' into fix-axis-iter

Author: jturner314

.travis.yml

@@ -4,16 +4,19 @@ sudo: required
 dist: trusty
 matrix:
   include:
-    - rust: 1.31.0
+    - rust: 1.32.0
       env:
        - FEATURES='test docs'
+       - RUSTFLAGS='-D warnings'
     - rust: stable
       env:
        - FEATURES='test docs'
+       - RUSTFLAGS='-D warnings'
     - rust: beta
       env:
        - FEATURES='test docs'
        - CHANNEL='beta'
+       - RUSTFLAGS='-D warnings'
     - rust: nightly
       env:
        - FEATURES='test docs'
@@ -27,9 +30,5 @@ addons:
     packages:
       - libopenblas-dev
       - gfortran
-before_script:
-  - rustup component add rustfmt
 script:
-  - |
-    cargo fmt --all -- --check &&
-    ./scripts/all-tests.sh "$FEATURES" "$CHANNEL"
+  - ./scripts/all-tests.sh "$FEATURES" "$CHANNEL"

benches/bench1.rs

@@ -7,7 +7,6 @@
     clippy::many_single_char_names
 )]
 
-extern crate ndarray;
 extern crate test;
 
 use ndarray::ShapeBuilder;

benches/chunks.rs

@@ -3,7 +3,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 use ndarray::NdProducer;
 

benches/construct.rs

@@ -8,7 +8,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 #[bench]

benches/gemv.rs

@@ -9,7 +9,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 use ndarray::linalg::general_mat_vec_mul;

benches/higher-order.rs

@@ -10,7 +10,6 @@ use std::iter::FromIterator;
 use test::black_box;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 const N: usize = 1024;
@@ -23,7 +22,7 @@ fn map_regular(bench: &mut Bencher) {
     bench.iter(|| a.map(|&x| 2. * x));
 }
 
-pub fn double_array(mut a: ArrayViewMut2<f64>) {
+pub fn double_array(mut a: ArrayViewMut2<'_, f64>) {
     a *= 2.0;
 }
 

benches/iter.rs

@@ -6,13 +6,11 @@
     clippy::many_single_char_names
 )]
 
-extern crate rawpointer;
 extern crate test;
 use rawpointer::PointerExt;
 use test::black_box;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 use ndarray::Slice;
 use ndarray::{FoldWhile, Zip};

benches/numeric.rs

@@ -3,7 +3,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 const N: usize = 1024;

benches/par_rayon.rs

@@ -1,11 +1,6 @@
 #![cfg(feature = "rayon")]
 #![feature(test)]
 
-extern crate rayon;
-
-extern crate itertools;
-extern crate ndarray;
-
 use ndarray::parallel::prelude::*;
 use ndarray::prelude::*;
 
@@ -17,8 +12,6 @@ use ndarray::Zip;
 const EXP_N: usize = 256;
 const ADDN: usize = 512;
 
-use std::cmp::max;
-
 fn set_threads() {
     // Consider setting a fixed number of threads here, for example to avoid
     // oversubscribing on hyperthreaded cores.

examples/axis_ops.rs

@@ -4,7 +4,6 @@
     clippy::unreadable_literal,
     clippy::many_single_char_names
 )]
-extern crate ndarray;
 
 use ndarray::prelude::*;
 

examples/bounds_check_elim.rs

@@ -8,8 +8,6 @@
 
 // Test cases for bounds check elimination
 
-extern crate ndarray;
-
 use ndarray::prelude::*;
 
 /*

examples/column_standardize.rs

@@ -1,8 +1,6 @@
-extern crate ndarray;
-
 use ndarray::prelude::*;
 
-fn std1d(a: ArrayView1<f64>) -> f64 {
+fn std1d(a: ArrayView1<'_, f64>) -> f64 {
     let n = a.len() as f64;
     if n == 0. {
         return 0.;

examples/convo.rs

@@ -13,7 +13,7 @@ const SHARPEN: [[f32; 3]; 3] = [[0., -1., 0.], [-1., 5., -1.], [0., -1., 0.]];
 type Kernel3x3<A> = [[A; 3]; 3];
 
 #[inline(never)]
-fn conv_3x3<F>(a: &ArrayView2<F>, out: &mut ArrayViewMut2<F>, kernel: &Kernel3x3<F>)
+fn conv_3x3<F>(a: &ArrayView2<'_, F>, out: &mut ArrayViewMut2<'_, F>, kernel: &Kernel3x3<F>)
 where
     F: Float,
 {

examples/life.rs

@@ -4,12 +4,11 @@
     clippy::unreadable_literal,
     clippy::many_single_char_names
 )]
-extern crate ndarray;
 
 use ndarray::prelude::*;
 use std::iter::FromIterator;
 
-const INPUT: &'static [u8] = include_bytes!("life.txt");
+const INPUT: &[u8] = include_bytes!("life.txt");
 
 const N: usize = 100;
 

examples/rollaxis.rs

@@ -1,5 +1,3 @@
-extern crate ndarray;
-
 use ndarray::prelude::*;
 use ndarray::Data;
 

examples/sort-axis.rs

@@ -1,5 +1,3 @@
-extern crate ndarray;
-
 use ndarray::prelude::*;
 use ndarray::{Data, RemoveAxis, Zip};
 

examples/zip_many.rs

@@ -4,7 +4,6 @@
     clippy::unreadable_literal,
     clippy::many_single_char_names
 )]
-extern crate ndarray;
 
 use ndarray::prelude::*;
 use ndarray::Zip;

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]

scripts/all-tests.sh

@@ -6,6 +6,7 @@ set -e
 FEATURES=$1
 CHANNEL=$2
 
+([ "$CHANNEL" != "beta" ] || (rustup component add rustfmt && cargo fmt --all -- --check))
 cargo build --verbose --no-default-features
 cargo test --verbose --no-default-features
 cargo test --release --verbose --no-default-features