[core.ADT] Copyable/movable feature layout (#384)

This commit revises feature::Layout class similarly as tensor::Layout.

With this commit, one may copy/move layout as if it is a plain value.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/libs/core/include/nncc/core/ADT/feature/CHWLayout.h b/libs/core/include/nncc/core/ADT/feature/CHWLayout.h
index 2f97755..2e94f70 100644 (file)
--- a/libs/core/include/nncc/core/ADT/feature/CHWLayout.h
+++ b/libs/core/include/nncc/core/ADT/feature/CHWLayout.h
@@ -14,7 +14,7 @@ namespace feature
 
 struct CHWLayout final : public Layout
 {
-  uint32_t offset(const Shape &, uint32_t ch, uint32_t row, uint32_t col) const override;
+  CHWLayout();
 };
 
 } // namespace feature

diff --git a/libs/core/include/nncc/core/ADT/feature/Layout.h b/libs/core/include/nncc/core/ADT/feature/Layout.h
index 85e3174..0440582 100644 (file)
--- a/libs/core/include/nncc/core/ADT/feature/Layout.h
+++ b/libs/core/include/nncc/core/ADT/feature/Layout.h
@@ -12,11 +12,22 @@ namespace ADT
 namespace feature
 {
 
-struct Layout
+class Layout
 {
-  virtual ~Layout() = default;
+public:
+  using Func = uint32_t (*)(const Shape &, uint32_t ch, uint32_t row, uint32_t col);
 
-  virtual uint32_t offset(const Shape &, uint32_t ch, uint32_t row, uint32_t col) const = 0;
+public:
+  explicit Layout(const Func &func);
+
+public:
+  uint32_t offset(const Shape &shape, uint32_t ch, uint32_t row, uint32_t col) const
+  {
+    return _func(shape, ch, row, col);
+  }
+
+private:
+  Func _func;
 };
 
 } // namespace feature

diff --git a/libs/core/src/ADT/feature/CHWLayout.cpp b/libs/core/src/ADT/feature/CHWLayout.cpp
index 16ce6c6..96f390c 100644 (file)
--- a/libs/core/src/ADT/feature/CHWLayout.cpp
+++ b/libs/core/src/ADT/feature/CHWLayout.cpp
@@ -1,5 +1,12 @@
 #include "nncc/core/ADT/feature/CHWLayout.h"
 
+using nncc::core::ADT::feature::Shape;
+
+static uint32_t CHW_offset(const Shape &shape, uint32_t ch, uint32_t row, uint32_t col)
+{
+  return (ch * shape.height() + row) * shape.width() + col;
+}
+
 namespace nncc
 {
 namespace core
@@ -9,9 +16,9 @@ namespace ADT
 namespace feature
 {
 
-uint32_t CHWLayout::offset(const Shape &shape, uint32_t ch, uint32_t row, uint32_t col) const
+CHWLayout::CHWLayout() : Layout{CHW_offset}
 {
-  return (ch * shape.height() + row) * shape.width() + col;
+  // DO NOTHING
 }
 
 } // namespace feature

diff --git a/libs/core/src/ADT/feature/Layout.cpp b/libs/core/src/ADT/feature/Layout.cpp
new file mode 100644 (file)
index 0000000..bb9edb7
--- /dev/null
+++ b/libs/core/src/ADT/feature/Layout.cpp
@@ -0,0 +1,19 @@
+#include "nncc/core/ADT/feature/Layout.h"
+
+#include <cassert>
+
+namespace nncc
+{
+namespace core
+{
+namespace ADT
+{
+namespace feature
+{
+
+Layout::Layout(const Func &func) : _func{func} { assert(_func != nullptr); }
+
+} // namespace feature
+} // namespace ADT
+} // namespace core
+} // namespace nncc

diff --git a/libs/core/src/ADT/feature/Layout.test.cpp b/libs/core/src/ADT/feature/Layout.test.cpp
new file mode 100644 (file)
index 0000000..c9d4528
--- /dev/null
+++ b/libs/core/src/ADT/feature/Layout.test.cpp
@@ -0,0 +1,40 @@
+#include "nncc/core/ADT/feature/Layout.h"
+
+#include <gtest/gtest.h>
+
+using nncc::core::ADT::feature::Shape;
+using nncc::core::ADT::feature::Layout;
+
+static uint32_t offset_0(const Shape &, uint32_t, uint32_t, uint32_t) { return 0; }
+static uint32_t offset_1(const Shape &, uint32_t, uint32_t, uint32_t) { return 1; }
+
+TEST(ADT_FEATURE_LAYOUT, ctor)
+{
+  Layout l{offset_0};
+
+  ASSERT_EQ(l.offset(Shape{4, 3, 6}, 1, 1, 1), 0);
+}
+
+TEST(ADT_FEATURE_LAYOUT, copy)
+{
+  Layout orig{offset_0};
+  Layout copy{offset_1};
+
+  ASSERT_EQ(copy.offset(Shape{4, 3, 6}, 1, 1, 1), 1);
+
+  copy = orig;
+
+  ASSERT_EQ(copy.offset(Shape{4, 3, 6}, 1, 1, 1), 0);
+}
+
+TEST(ADT_FEATURE_LAYOUT, move)
+{
+  Layout orig{offset_0};
+  Layout move{offset_1};
+
+  ASSERT_EQ(move.offset(Shape{4, 3, 6}, 1, 1, 1), 1);
+
+  move = std::move(orig);
+
+  ASSERT_EQ(move.offset(Shape{4, 3, 6}, 1, 1, 1), 0);
+}