Skip to content

Use ndarray 0.11 and lapack-src #98

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

Merged
merged 3 commits into from
Jan 12, 2018
Merged

Use ndarray 0.11 and lapack-src #98

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
45850a6
Use ndarray 0.11 and lapack-src
termoshtt Jan 11, 2018
23644fe
Enable BLAS flag in ndarray
termoshtt Jan 11, 2018
7b87443
Use lapack-src 0.1.4 for intel-mkl feature
termoshtt Jan 12, 2018
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
35 changes: 21 additions & 14 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,32 @@ readme = "README.md"
categories = ["algorithms", "science"]

[features]
default = []
openblas = ["openblas-src"]
netlib = ["netlib-src"]
intel-mkl = ["intel-mkl-src"]
default = []
accelerate = ["lapack-src/accelerate", "blas-src/accelerate"]
intel-mkl = ["lapack-src/intel-mkl", "blas-src/intel-mkl"]
netlib = ["lapack-src/netlib", "blas-src/netlib", "netlib-src"]
openblas = ["lapack-src/openblas", "blas-src/openblas", "openblas-src"]

[dependencies]
rand = "0.3"
derive-new = "0.5"
procedurals = "0.2"
num-traits = "0.1"
num-complex = { version = "0.1", default-features = false }
lapacke = "0.1.4"
num-complex = "0.1"
num-traits = "0.1"
procedurals = "0.2"
rand = "0.4"

[dependencies.ndarray]
version = "0.10"
version = "0.11"
features = ["blas"]
default-features = false

[dependencies.openblas-src]
version = "0.5.3"
features = ["static", "cblas", "lapacke"]
[dependencies.blas-src]
version = "0.1"
default-features = false
optional = true

[dependencies.lapack-src]
version = "0.1"
default-features = false
optional = true

Expand All @@ -41,7 +47,8 @@ features = ["static", "cblas", "lapacke", "tmg"]
default-features = false
optional = true

[dependencies.intel-mkl-src]
version = "0.2.5"
[dependencies.openblas-src]
version = "0.5.3"
features = ["static", "cblas", "lapacke"]
default-features = false
optional = true
9 changes: 0 additions & 9 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,6 @@ extern crate procedurals;
#[macro_use]
extern crate derive_new;

#[cfg(feature = "openblas")]
extern crate openblas_src;

#[cfg(feature = "netlib")]
extern crate netlib_src;

#[cfg(feature = "intel-mkl")]
extern crate intel_mkl_src;

pub mod assert;
pub mod cholesky;
pub mod convert;
Expand Down