Refactoring - offset

Author: chlict

src/includes/LayoutProvider.hpp

@@ -31,14 +31,14 @@ struct AbstractLayoutProvider {
   }
 
   template <typename Pos, typename Layout>
-  static constexpr auto offset(Pos &&pos, Layout &&layout) {
+  static constexpr auto offset(Layout &&layout, Pos &&pos) {
     static_assert(is_dims_type<std::remove_reference_t<Pos> >);
     static_assert(is_layout_type<std::remove_reference_t<Layout> >);
     auto dimensions = view_to_dimensions(std::forward<Pos>(pos));
     auto strides = layout.strides();
     // Takes RowMajorLayout for example:
     // view:         [rows: 2, cols: 4]
-    // layout.shape  [dim0: 4, dim0: 2]
+    // layout.dimens [dim0: 4, dim0: 2]
     // layout.strides[dim0: 1, dim1: 4]
     // pos:          [row:  1, col:  2]
     // dimensions:   [dim0: 2, dim1: 1]

src/includes/Tensor.hpp

@@ -113,7 +113,7 @@ struct Tensor : TensorHandle {
   template <typename Pos>
   constexpr ElemType *elem_addr(Pos const &pos) const {
     using Layout = typename format_traits<Format>::layout_provider_type;
-    auto offset = Layout::offset(pos, layout());
+    auto offset = Layout::offset(layout(), pos);
     return (ElemType *)addr() + (long)offset;
   }
 

test/TestTensorFormat.cpp

@@ -48,8 +48,8 @@ TEST(TestTensorFormat, TestRowMajor) {
 
   auto layout = format.layout();
   auto off1 =
-      AbstractLayoutProvider<RowMajorLayout>::offset(Dim2(1_c, 2_c), layout);
-  auto off2 = RowMajorLayout::offset(Dim2(1_c, 2_c), layout);
+      AbstractLayoutProvider<RowMajorLayout>::offset(layout, Dim2(1_c, 2_c));
+  auto off2 = RowMajorLayout::offset(layout, Dim2(1_c, 2_c));
   static_assert(off1 == off2);
   static_assert(off1 == 6_c);
 }
@@ -64,8 +64,8 @@ TEST(TestTensorFormat, TestColMajor) {
 
   auto layout = format.layout();
   auto off1 =
-      AbstractLayoutProvider<ColMajorLayout>::offset(Dim2(1_c, 2_c), layout);
-  auto off2 = ColMajorLayout::offset(Dim2(1_c, 2_c), layout);
+      AbstractLayoutProvider<ColMajorLayout>::offset(layout, Dim2(1_c, 2_c));
+  auto off2 = ColMajorLayout::offset(layout, Dim2(1_c, 2_c));
   static_assert(off1 == off2);
   static_assert(off1 == 5_c);
 }
@@ -99,7 +99,7 @@ TEST(TestTensorFormat, TestOffset1) {
     auto pos = Dim2(row, col);
     using LayoutProvider =
         typename format_traits<decltype(format1)>::layout_provider_type;
-    auto offset = LayoutProvider::offset(pos, layout1);
+    auto offset = LayoutProvider::offset(layout1, pos);
     static_assert(offset == row * 4_c + col);
     // std::cout << "offset: " << offset << std::endl;
   });
@@ -122,7 +122,7 @@ TEST(TestTensorFormat, TestOffset2) {
     auto pos = Dim2(row, col);
     using LayoutProvider =
         typename format_traits<decltype(format1)>::layout_provider_type;
-    auto offset = LayoutProvider::offset(pos, layout1);
+    auto offset = LayoutProvider::offset(layout1, pos);
     static_assert(offset == col * 2_c + row);
     // std::cout << "offset: " << offset << std::endl;
   });