Order constructor for arrays

Author: bluss

src/shape_builder.rs

@@ -222,6 +222,30 @@ impl<T> ShapeArg for (T, Order) where T: IntoDimension {
     }
 }
 
+impl<T> ShapeBuilder for (T, Order) where T: IntoDimension {
+    type Dim = T::Dim;
+    type Strides = T;
+    fn into_shape(self) -> Shape<Self::Dim> {
+        let strides = match self.1 {
+            Order::C | Order::A => Strides::C,
+            Order::F => Strides::F,
+        };
+        Shape {
+            dim: self.0.into_dimension(),
+            strides,
+        }
+    }
+    fn f(self) -> Shape<Self::Dim> {
+        self.set_f(true)
+    }
+    fn set_f(self, is_f: bool) -> Shape<Self::Dim> {
+        self.into_shape().set_f(is_f)
+    }
+    fn strides(self, st: T) -> StrideShape<Self::Dim> {
+        self.into_shape().strides(st.into_dimension())
+    }
+}
+
 /// Custom strides
 #[derive(Copy, Clone, Debug)]
 pub struct CustomStrides<D> { strides: D }

tests/array-construct.rs

@@ -8,6 +8,7 @@
 use defmac::defmac;
 use ndarray::prelude::*;
 use ndarray::Zip;
+use ndarray::Order;
 
 #[test]
 fn test_from_shape_fn() {
@@ -248,3 +249,13 @@ fn maybe_uninit_1() {
 
     }
 }
+
+#[test]
+fn test_order_constructor() {
+    type Mat<D> = Array<f32, D>;
+    let a = Mat::zeros(((3, 3), Order::C));
+    let b = Mat::zeros(((3, 3), Order::F));
+    let c = Mat::zeros(((3, 3), Order::A));
+    assert_eq!(a.strides(), b.t().strides());
+    assert_eq!(a.strides(), c.strides());
+}