Skip to content

Commit 6460fe1

Browse files
authored
Merge pull request #98 from termoshtt/v0.9
Use ndarray 0.11 and lapack-src
2 parents 8510278 + 7b87443 commit 6460fe1

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

Cargo.toml

+21-14
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,32 @@ readme = "README.md"
1212
categories = ["algorithms", "science"]
1313

1414
[features]
15-
default = []
16-
openblas = ["openblas-src"]
17-
netlib = ["netlib-src"]
18-
intel-mkl = ["intel-mkl-src"]
15+
default = []
16+
accelerate = ["lapack-src/accelerate", "blas-src/accelerate"]
17+
intel-mkl = ["lapack-src/intel-mkl", "blas-src/intel-mkl"]
18+
netlib = ["lapack-src/netlib", "blas-src/netlib", "netlib-src"]
19+
openblas = ["lapack-src/openblas", "blas-src/openblas", "openblas-src"]
1920

2021
[dependencies]
21-
rand = "0.3"
2222
derive-new = "0.5"
23-
procedurals = "0.2"
24-
num-traits = "0.1"
25-
num-complex = { version = "0.1", default-features = false }
2623
lapacke = "0.1.4"
24+
num-complex = "0.1"
25+
num-traits = "0.1"
26+
procedurals = "0.2"
27+
rand = "0.4"
2728

2829
[dependencies.ndarray]
29-
version = "0.10"
30+
version = "0.11"
31+
features = ["blas"]
3032
default-features = false
3133

32-
[dependencies.openblas-src]
33-
version = "0.5.3"
34-
features = ["static", "cblas", "lapacke"]
34+
[dependencies.blas-src]
35+
version = "0.1"
36+
default-features = false
37+
optional = true
38+
39+
[dependencies.lapack-src]
40+
version = "0.1"
3541
default-features = false
3642
optional = true
3743

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

44-
[dependencies.intel-mkl-src]
45-
version = "0.2.5"
50+
[dependencies.openblas-src]
51+
version = "0.5.3"
52+
features = ["static", "cblas", "lapacke"]
4653
default-features = false
4754
optional = true

src/lib.rs

-9
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ extern crate procedurals;
2828
#[macro_use]
2929
extern crate derive_new;
3030

31-
#[cfg(feature = "openblas")]
32-
extern crate openblas_src;
33-
34-
#[cfg(feature = "netlib")]
35-
extern crate netlib_src;
36-
37-
#[cfg(feature = "intel-mkl")]
38-
extern crate intel_mkl_src;
39-
4031
pub mod assert;
4132
pub mod cholesky;
4233
pub mod convert;

0 commit comments

Comments
 (0)