Merge pull request #92 from termoshtt/intel-mkl

Intel MKL support

Author: termoshtt

Cargo.toml

@@ -19,22 +19,20 @@ openblas-system = ["lapack/openblas", "openblas-src/system"]
 netlib-shared   = ["lapack/netlib"]
 netlib-static   = ["lapack/netlib", "netlib-src/static"]
 netlib-system   = ["lapack/netlib", "netlib-src/system"]
+intel-mkl       = ["intel-mkl-src"]
 
 [dependencies]
 rand = "0.3"
 derive-new = "0.4"
 procedurals = "0.2"
 num-traits  = "0.1"
 num-complex = "0.1"
+lapack = { version = "0.13", default-features = false }
+lapack-sys = { version = "0.11", default-features = false }
 
 [dependencies.ndarray]
 version = "0.10"
 default-features = false
-features = ["blas"]
-
-[dependencies.lapack]
-version = "0.13"
-default-features = false
 
 [dependencies.openblas-src]
 version = "0.5.3"
@@ -45,3 +43,8 @@ optional = true
 version = "0.7.0"
 default-features = false
 optional = true
+
+[dependencies.intel-mkl-src]
+version = "0.2.5"
+default-features = false
+optional = true

README.md

@@ -17,14 +17,16 @@ and more (See Cargo.toml).
 Feature flags
 --------------
 
-- OpenBLAS
+- [OpenBLAS](https://github.com/cmr/openblas-src)
   - `openblas-static`: use OpenBLAS with static link (default)
   - `openblas-shared`: use OpenBLAS with shared link
   - `openblas-system`: use system OpenBLAS (experimental)
-- Netlib
+- [Netlib](https://github.com/cmr/netlib-src)
   - `netlib-static`: use Netlib with static link (default)
   - `netlib-shared`: use Netlib with shared link
   - `netlib-system`: use system Netlib (experimental)
+- [Intel MKL](https://github.com/termoshtt/rust-intel-mkl) (non-free license, see the linked page)
+  - `intel-mkl`: use Intel MKL shared link (experimental)
 
 Examples
 ---------

src/layout.rs

@@ -116,7 +116,9 @@ where
         if self.is_square() {
             Ok(())
         } else {
-            Err(NotSquareError::new(self.rows() as i32, self.cols() as i32).into())
+            Err(
+                NotSquareError::new(self.rows() as i32, self.cols() as i32).into(),
+            )
         }
     }
 

src/lib.rs

@@ -18,6 +18,7 @@
 //!  - [Scalar trait](types/trait.Scalar.html)
 
 extern crate lapack;
+extern crate lapack_sys;
 extern crate num_traits;
 extern crate num_complex;
 extern crate rand;
@@ -28,6 +29,9 @@ extern crate procedurals;
 #[macro_use]
 extern crate derive_new;
 
+#[cfg(feature = "intel-mkl")]
+extern crate intel_mkl_src;
+
 pub mod assert;
 pub mod cholesky;
 pub mod convert;

wercker.yml

@@ -11,3 +11,9 @@ test-netlib:
     - script:
       name: test NetLib backend
       code: cargo test --no-default-features --features=netlib-static
+
+test-intel-mkl:
+  steps:
+    - script:
+      name: test Intel MKL backend
+      code: cargo test --no-default-features --features=intel-mkl