Skip to content

Commit d255a89

Browse files
committed
Use official lapack-sys
1 parent 2b06457 commit d255a89

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

Cargo.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,20 @@ openblas-system = ["lapack/openblas", "openblas-src/system"]
1919
netlib-shared = ["lapack/netlib"]
2020
netlib-static = ["lapack/netlib", "netlib-src/static"]
2121
netlib-system = ["lapack/netlib", "netlib-src/system"]
22-
intel-mkl = ["lapack/intel-mkl", "intel-mkl-src"]
22+
intel-mkl = ["intel-mkl-src"]
2323

2424
[dependencies]
2525
rand = "0.3"
2626
derive-new = "0.4"
2727
procedurals = "0.2"
2828
num-traits = "0.1"
2929
num-complex = "0.1"
30+
lapack = { version = "0.13", default-features = false }
31+
lapack-sys = { version = "0.11", default-features = false }
3032

3133
[dependencies.ndarray]
3234
version = "0.10"
3335
default-features = false
34-
features = ["blas"]
35-
36-
[dependencies.lapack]
37-
git = "http://github.com/termoshtt/lapack"
38-
branch = "intel-mkl"
39-
default-features = false
4036

4137
[dependencies.openblas-src]
4238
version = "0.5.3"

src/layout.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ where
116116
if self.is_square() {
117117
Ok(())
118118
} else {
119-
Err(NotSquareError::new(self.rows() as i32, self.cols() as i32).into())
119+
Err(
120+
NotSquareError::new(self.rows() as i32, self.cols() as i32).into(),
121+
)
120122
}
121123
}
122124

src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
//! - [Scalar trait](types/trait.Scalar.html)
1919
2020
extern crate lapack;
21+
extern crate lapack_sys;
2122
extern crate num_traits;
2223
extern crate num_complex;
2324
extern crate rand;
@@ -28,6 +29,9 @@ extern crate procedurals;
2829
#[macro_use]
2930
extern crate derive_new;
3031

32+
#[cfg(feature = "intel-mkl")]
33+
extern crate intel_mkl_src;
34+
3135
pub mod assert;
3236
pub mod cholesky;
3337
pub mod convert;

0 commit comments

Comments
 (0)