diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs index 021e799..3ba7bf2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use mdarray::{view, array, tensor, Slice, Dim, Const, Dyn, Rank, expr::Expression, Dense}; +use mdarray::{view, array, tensor, Slice, Dim, Const, expr::Expression}; // Indexing convention: C_ij <- A_ik * B_kj fn matmul<D0: Dim, D1: Dim, D2: Dim>( @@ -17,7 +17,7 @@ fn matmul<D0: Dim, D1: Dim, D2: Dim>( fn main() { let a = view![[1.0, 4.0], [2.0, 5.0], [3.0, 6.0]]; let b = array![[0.0, 1.0], [1.0, 1.0]]; - let b = b.reshape((Const::<2>, Dyn(!0))); + let b = b.reshape((Const::<2>, !0)); // .into_dyn() replaces .reshape(DynRank::from_dims(&[2, 3])).into(): let mut c: mdarray::Tensor<f64> = tensor![[0.0; 2]; 3].into_dyn(); @@ -26,7 +26,7 @@ fn main() { dbg!(std::any::type_name_of_val(&b)); dbg!(std::any::type_name_of_val(&c)); - matmul(&a.reshape((Dyn(3), Const::<2>)), &b, &mut c.remap_mut()); + matmul(&a.reshape((3, Const::<2>)), &b, &mut c.remap_mut()); assert_eq!(c, view![[4.0, 5.0], [5.0, 7.0], [6.0, 9.0]]); @@ -39,7 +39,6 @@ fn main() { dbg!(std::any::type_name_of_val(&e)); // permute - let f = c.remap::<Rank<2>, Dense>(); - let f = f.permute::<1, 0>(); + let f = c.permute((1, 0)); dbg!(std::any::type_name_of_val(&f)); } |