Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rand 0.6 -> 0.7 #660

Merged
merged 2 commits into from
Oct 15, 2019
Merged

Rand 0.6 -> 0.7 #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c65664
Rand 0.6 -> 0.7
dodomorandi Oct 11, 2019
8bfbffd
Updated rand and quickcheck for nalgebra-lapack
dodomorandi Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ path = "src/lib.rs"

[features]
default = [ "std" ]
std = [ "matrixmultiply", "rand/std", "alga/std" ]
std = [ "matrixmultiply", "rand/std", "rand_distr", "alga/std" ]
stdweb = [ "rand/stdweb" ]
arbitrary = [ "quickcheck" ]
serde-serialize = [ "serde", "serde_derive", "num-complex/serde" ]
Expand All @@ -34,18 +34,19 @@ io = [ "pest", "pest_derive" ]
[dependencies]
typenum = "1.10"
generic-array = "0.12"
rand = { version = "0.6", default-features = false }
rand = { version = "0.7", default-features = false }
num-traits = { version = "0.2", default-features = false }
num-complex = { version = "0.2", default-features = false }
num-rational = { version = "0.2", default-features = false }
approx = { version = "0.3", default-features = false }
alga = { version = "0.9", default-features = false }
rand_distr = { version = "0.2", optional = true }
matrixmultiply = { version = "0.2", optional = true }
serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true }
abomonation = { version = "0.7", optional = true }
mint = { version = "0.5", optional = true }
quickcheck = { version = "0.8", optional = true }
quickcheck = { version = "0.9", optional = true }
pest = { version = "2.0", optional = true }
pest_derive = { version = "2.0", optional = true }

Expand All @@ -54,7 +55,7 @@ pest_derive = { version = "2.0", optional = true }

[dev-dependencies]
serde_json = "1.0"
rand_xorshift = "0.1"
rand_xorshift = "0.2"
### Uncomment this line before running benchmarks.
### We can't just let this uncommented because that would break
### compilation for #[no-std] because of the terrible Cargo bug
Expand Down
4 changes: 2 additions & 2 deletions nalgebra-lapack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ lapack-src = { version = "0.2", default-features = false }

[dev-dependencies]
nalgebra = { version = "0.18", path = "..", features = [ "arbitrary" ] }
quickcheck = "0.8"
quickcheck = "0.9"
approx = "0.3"
rand = "0.6"
rand = "0.7"
4 changes: 3 additions & 1 deletion src/base/construction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ use num::{Bounded, One, Zero};
use rand::distributions::{Distribution, Standard};
use rand::Rng;
#[cfg(feature = "std")]
use rand::{self, distributions::StandardNormal};
use rand;
#[cfg(feature = "std")]
use rand_distr::StandardNormal;
use std::iter;
use typenum::{self, Cmp, Greater};

Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ extern crate num_complex;
extern crate num_traits as num;
extern crate num_rational;
extern crate rand;
#[cfg(feature = "std")]
extern crate rand_distr;
extern crate typenum;

extern crate alga;
Expand Down