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

Jump to bottom

Bump to approx 0.4, num-complex 0.3 #851

Merged
merged 3 commits into from Nov 28, 2020
Merged

Bump to approx 0.4, num-complex 0.3 #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cf7572
API: Bump num-complex to version 0.3
bluss Nov 28, 2020
a9b4ab8
API: Bump approx to 0.4
bluss Nov 28, 2020
84eeb11
MAINT: Write license spec in Cargo.toml in the more spec-correct way
bluss Nov 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ authors = [
"bluss",
"Jim Turner"
]
license = "MIT/Apache-2.0"
license = "MIT OR Apache-2.0"
readme = "README-crates.io.md"

repository = "https://github.com/rust-ndarray/ndarray"
Expand All @@ -30,11 +30,11 @@ test = true
[dependencies]
num-integer = "0.1.39"
num-traits = "0.2"
num-complex = "0.2"
num-complex = { version = "0.3", default-features = false }

rayon = { version = "1.0.3", optional = true }

approx = { version = "0.3.2", optional = true }
approx = { version = "0.4", optional = true }

# Use via the `blas` crate feature!
cblas-sys = { version = "0.1.4", optional = true, default-features = false }
Expand All @@ -47,7 +47,7 @@ rawpointer = { version = "0.2" }
[dev-dependencies]
defmac = "0.2"
quickcheck = { version = "0.9", default-features = false }
approx = "0.3.2"
approx = "0.4"
itertools = { version = "0.9.0", default-features = false, features = ["use_std"] }

[features]
Expand Down
2 changes: 1 addition & 1 deletion blas-tests/Cargo.toml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ publish = false
test = false

[dev-dependencies]
approx = "0.3.2"
approx = "0.4"
ndarray = { path = "../", features = ["approx", "blas"] }
blas-src = { version = "0.6.1", default-features = false, features = ["openblas"] }
openblas-src = { version = "0.9.0", default-features = false, features = ["cblas", "system"] }
Expand Down
2 changes: 1 addition & 1 deletion numeric-tests/Cargo.toml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ authors = ["bluss"]
publish = false

[dependencies]
approx = "0.3.2"
approx = "0.4"
ndarray = { path = "..", features = ["approx"] }
ndarray-rand = { path = "../ndarray-rand/" }
rand_distr = "0.2.1"
Expand Down
2 changes: 1 addition & 1 deletion tests/complex.rs
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ fn c<T: Clone + Num>(re: T, im: T) -> Complex<T> {
#[test]
fn complex_mat_mul() {
let a = arr2(&[[c(3., 4.), c(2., 0.)], [c(0., -2.), c(3., 0.)]]);
let b = (&a * c(3., 0.)).map(|c| 5. * c / c.norm());
let b = (&a * c(3., 0.)).map(|c| 5. * c / c.norm_sqr());
println!("{:>8.2}", b);
let e = Array::eye(2);
let r = a.dot(&e);
Expand Down