diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.rs b/src/main.rs index c0ee447..31d810b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ -use mdarray::{expr, grid, DSpan, Expression}; +use mdarray::{view, tensor, DSlice, Expression}; -fn matmul(a: &DSpan<f64, 2>, b: &DSpan<f64, 2>, c: &mut DSpan<f64, 2>) { +fn matmul(a: &DSlice<f64, 2>, b: &DSlice<f64, 2>, c: &mut DSlice<f64, 2>) { for (mut cj, bj) in c.cols_mut().zip(b.cols()) { for (ak, bkj) in a.cols().zip(bj) { for (cij, aik) in cj.expr_mut().zip(ak) { @@ -11,10 +11,10 @@ fn matmul(a: &DSpan<f64, 2>, b: &DSpan<f64, 2>, c: &mut DSpan<f64, 2>) { } fn main() { - let a = expr![[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]; - let b = expr![[0.0, 1.0], [1.0, 1.0]]; + let a = view![[1.0, 4.0], [2.0, 5.0], [3.0, 6.0]]; + let b = view![[0.0, 1.0], [1.0, 1.0]]; - let mut c = grid![[0.0; 3]; 2]; + let mut c = tensor![[0.0; 2]; 3]; dbg!(std::any::type_name_of_val(&a)); dbg!(std::any::type_name_of_val(&b)); @@ -22,7 +22,7 @@ fn main() { matmul(&a, &b, &mut c); - assert_eq!(c, expr![[4.0, 5.0, 6.0], [5.0, 7.0, 9.0]]); + assert_eq!(c, view![[4.0, 5.0], [5.0, 7.0], [6.0, 9.0]]); // slice let d = a.view(1, ..); |