Merge pull request #134 from bluss/blas-matmul

Switch to blas-sys and use BLAS in .mat_mul

Author: bluss

.travis.yml

@@ -1,16 +1,24 @@
 language: rust
-sudo: false
+# use trusty for newer openblas
+sudo: required
+dist: trusty
 matrix:
   include:
     - rust: stable
+      env:
+       - FEATURES='test'
     - rust: beta
     - rust: nightly
       env:
-       - FEATURES='assign_ops rustc-serialize'
+       - FEATURES='test'
        - BENCH=1
 branches:
   only:
     - master
+addons:
+  apt:
+    packages:
+      - libopenblas-dev
 script:
   - |
       cargo build --verbose &&

Cargo.toml

@@ -35,18 +35,24 @@ version = "0.3.16"
 optional = true
 
 [dependencies]
-rblas = { version = "0.0.13", optional = true }
+blas-sys = { version = "0.5", optional = true, default-features = false }
 
-#[dependencies.serde]
-#version = "0.4"
-#optional = true
+# rblas is deprecatedish
+rblas = { version = "0.0.13", optional = true }
 
 [features]
 
 assign_ops = []
 
+blas = ["blas-sys"]
+blas-openblas-sys = [
+    "blas",
+    "blas-sys/openblas",
+    "blas-sys/openblas-provider/system-openblas",
+]
+
 # This feature is used for testing
-all = ["assign_ops", "rblas", "rustc-serialize"]
+test = ["blas-openblas-sys", "rustc-serialize"]
 
 [profile.release]
 [profile.bench]

Makefile

@@ -3,7 +3,7 @@ DOCCRATES = ndarray
 # deps to delete the generated docs
 RMDOCS =
 
-FEATURES = "assign_ops rustc-serialize rblas"
+FEATURES = "assign_ops rustc-serialize rblas blas"
 
 VERSIONS = $(patsubst %,target/VERS/%,$(DOCCRATES))
 

benches/bench1.rs

@@ -433,19 +433,52 @@ fn bench_col_iter(bench: &mut test::Bencher)
     bench.iter(|| for elt in it.clone() { black_box(elt); })
 }
 
-#[bench]
-fn bench_mat_mul_large(bench: &mut test::Bencher)
-{
-    let a = OwnedArray::<f32, _>::zeros((64, 64));
-    let b = OwnedArray::<f32, _>::zeros((64, 64));
-    let a = black_box(a.view());
-    let b = black_box(b.view());
-    bench.iter(|| a.mat_mul(&b));
+macro_rules! mat_mul {
+    ($modname:ident, $ty:ident, $(($name:ident, $m:expr, $n:expr, $k:expr))+) => {
+        mod $modname {
+            use test::{black_box, Bencher};
+            use ndarray::OwnedArray;
+            $(
+            #[bench]
+            fn $name(bench: &mut Bencher)
+            {
+                let a = OwnedArray::<$ty, _>::zeros(($m, $n));
+                let b = OwnedArray::<$ty, _>::zeros(($n, $k));
+                let a = black_box(a.view());
+                let b = black_box(b.view());
+                bench.iter(|| a.mat_mul(&b));
+            }
+            )+
+        }
+    }
+}
+
+mat_mul!{mat_mul_f32, f32,
+    (m004, 4, 4, 4)
+    (m007, 7, 7, 7)
+    (m008, 8, 8, 8)
+    (m012, 12, 12, 12)
+    (m016, 16, 16, 16)
+    (m032, 32, 32, 32)
+    (m064, 64, 64, 64)
+    (m127, 127, 127, 127)
+    (mix16x4, 32, 4, 32)
+    (mix32x2, 32, 2, 32)
+}
+
+mat_mul!{mat_mul_i32, i32,
+    (m004, 4, 4, 4)
+    (m007, 7, 7, 7)
+    (m008, 8, 8, 8)
+    (m012, 12, 12, 12)
+    (m016, 16, 16, 16)
+    (m032, 32, 32, 32)
+    (m064, 64, 64, 64)
 }
 
 #[cfg(feature = "rblas")]
 #[bench]
-fn bench_mat_mul_rblas_large(bench: &mut test::Bencher)
+fn bench_mat_mul_rblas_64(bench: &mut test::Bencher)
 {
     use rblas::Gemm;
     use rblas::attribute::Transpose;

src/arrayformat.rs

@@ -105,7 +105,10 @@ impl<'a, A: fmt::Debug, S, D: Dimension> fmt::Debug for ArrayBase<S, D>
     where S: Data<Elem=A>,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_array(self, f, <_>::fmt)
+        // Add extra information for Debug
+        try!(format_array(self, f, <_>::fmt));
+        try!(write!(f, " shape={:?}, strides={:?}", self.shape(), self.strides()));
+        Ok(())
     }
 }
 

src/blas.rs

@@ -55,6 +55,7 @@
 //! I know), instead output its own error conditions, for example on dimension
 //! mismatch in a matrix multiplication.
 //!
+#![cfg_attr(has_deprecated, deprecated(note="`rblas` integration will move to its own crate."))]
 
 use std::os::raw::{c_int};