diff --git a/Cargo.toml b/Cargo.toml index e35d77b4..c0941b20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 @@ -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 diff --git a/src/lib.rs b/src/lib.rs index e17f4ad3..91178b22 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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;