fix mm benches

sonos · Oct 16, 2023 · cc91e4d · cc91e4d
1 parent c92f596
commit cc91e4d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/linalg/benches/arm64.rs b/linalg/benches/arm64.rs
@@ -1,16 +1,15 @@
 use std::time::Instant;
 
 use tract_data::prelude::*;
-use tract_linalg::frame::mmm::LinearSpec;
+use tract_linalg::LADatum;
+use tract_linalg::frame::mmm::FusedSpec;
 use tract_linalg::frame::mmm::MatMatMulKer;
-use tract_linalg::frame::mmm::MatMatMulKerSpec;
-use tract_linalg::mmm::{InputStoreKer, OutputStoreKer};
 
 fn ruin_cache() {
     let _a = (0..1000000).collect::<Vec<i32>>();
 }
 
-fn bench_to_nanos<T: Datum + Copy + num_traits::Zero, K: MatMatMulKer<T>>(
+fn bench_to_nanos<T: LADatum + Copy + num_traits::Zero, K: MatMatMulKer<T>>(
     k: usize,
     loops: usize,
 ) -> f64 {

diff --git a/linalg/matmul-bench/benches/matmul.rs b/linalg/matmul-bench/benches/matmul.rs
@@ -76,7 +76,7 @@ pub fn tract_blaslike(
                         FusedSpec::AddMatMul {
                             k,
                             a: a_storage.wrap(&pa.view()),
-                            b: b_storage.wrap(&pb.view()).unwrap(),
+                            b: b_storage.wrap(&pb.view()),
                         },
                         FusedSpec::Store(c_storage.wrap(&mut c.view_mut())),
                     ],

diff --git a/linalg/matmul-bench/src/lib.rs b/linalg/matmul-bench/src/lib.rs
@@ -442,7 +442,7 @@ pub fn tract(m: usize, k: usize, n: usize, a: &[f32], b: &[f32], c: &mut [f32])
                 FusedSpec::AddMatMul {
                     k,
                     a: a_storage.wrap(&pa.view()),
-                    b: b_storage.wrap(&pb.view()).unwrap(),
+                    b: b_storage.wrap(&pb.view()),
                 },
                 FusedSpec::Store(c_storage.wrap(&mut tc.view_mut())),
             ],