Skip to content

Commit 500e17c

Browse files
committed
Drop blas-src, lapack-src. New fine-grained features
1 parent 688f80c commit 500e17c

File tree

2 files changed

+33
-29
lines changed

2 files changed

+33
-29
lines changed

Cargo.toml

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,33 @@ readme = "README.md"
1313
categories = ["algorithms", "science"]
1414

1515
[features]
16-
default = []
17-
intel-mkl = ["lapack-src/intel-mkl", "blas-src/intel-mkl"]
18-
netlib = ["lapack-src/netlib", "blas-src/netlib"]
19-
openblas = ["lapack-src/openblas", "blas-src/openblas"]
20-
serde-1 = ["ndarray/serde-1", "num-complex/serde"]
16+
default = []
2117

22-
static = ["openblas-static"]
23-
openblas-static = ["openblas", "openblas-src"]
18+
netlib = ["netlib-static"]
19+
openblas = ["openblas-static"]
20+
intel-mkl = ["mkl-static-lp64-seq"]
21+
22+
netlib-static = ["netlib-src/static"]
23+
netlib-system = ["netlib-src/system"]
24+
openblas-static = ["openblas-src/static"]
25+
openblas-system = ["openblas-src/system"]
26+
27+
mkl-static-lp64-iomp = ["intel-mkl-src/mkl-static-lp64-iomp"]
28+
mkl-static-lp64-seq = ["intel-mkl-src/mkl-static-lp64-seq"]
29+
mkl-dynamic-lp64-iomp = ["intel-mkl-src/mkl-dynamic-lp64-iomp"]
30+
mkl-dynamic-lp64-seq = ["intel-mkl-src/mkl-dynamic-lp64-seq"]
2431

2532
[dependencies]
33+
cauchy = "0.2.2"
2634
lapacke = "0.2.0"
35+
ndarray = { version = "0.13", features = ["blas", "approx", "serde-1"], default-features = false }
36+
num-complex = { version = "0.2", features = ["serde"] }
2737
num-traits = "0.2.11"
28-
cauchy = "0.2.2"
29-
num-complex = "0.2.4"
3038
rand = "0.5"
3139

32-
[dependencies.ndarray]
33-
version = "0.13.0"
34-
features = ["blas", "approx"]
35-
default-features = false
36-
37-
[dependencies.blas-src]
38-
version = "0.6.1"
39-
default-features = false
40-
41-
[dependencies.lapack-src]
42-
version = "0.6.0"
43-
default-features = false
44-
45-
[dependencies.openblas-src]
46-
version = "0.9.0"
47-
default-features = false
48-
features = ["static"]
49-
optional = true
40+
openblas-src = { version = "0.9.0", optional = true }
41+
netlib-src = { version = "0.8.0", optional = true }
42+
intel-mkl-src = { version = "0.6.0", default-features = false, features = ["download"], optional = true }
5043

5144
[dev-dependencies]
5245
paste = "0.1.9"

src/lib.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,19 @@
4141
#[macro_use]
4242
extern crate ndarray;
4343

44-
extern crate blas_src;
45-
extern crate lapack_src;
44+
#[cfg(any(
45+
feature = "mkl-static-lp64-iomp",
46+
feature = "mkl-static-lp64-seq",
47+
feature = "mkl-dynamic-lp64-iomp",
48+
feature = "mkl-dynamic-lp64-seq",
49+
))]
50+
extern crate intel_mkl_src as _src;
51+
52+
#[cfg(any(feature = "openblas-system", feature = "openblas-static"))]
53+
extern crate openblas_src as _src;
54+
55+
#[cfg(any(feature = "netlib-system", feature = "netlib-static"))]
56+
extern crate netlib_src as _src;
4657

4758
pub mod assert;
4859
pub mod cholesky;

0 commit comments

Comments
 (0)