From 7e1a124b753e0e7b2d8419157b399f95969ae313 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?=
 =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?=
 =?utf8?q?=EC=A0=84=EC=9E=90?= <jh1302.park@samsung.com>
Date: Thu, 26 Jul 2018 08:47:36 +0900
Subject: [PATCH] [coco] Non-template UnitF instruction (#789)

* [coco] Non-template UnitF instruction

This commit revises UnitF instruction class as a non-template class.

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

* Simplify 'create' method
---
 contrib/coco/core/include/coco/IR/Instr.h        | 12 +++++++-----
 contrib/coco/core/include/coco/IR/InstrManager.h |  2 +-
 contrib/coco/core/include/coco/IR/Op.forward.h   | 11 +++++++++++
 contrib/coco/core/src/IR/Instr.test.cpp          |  4 ++--
 contrib/coco/core/src/IR/InstrManager.cpp        |  4 ++--
 contrib/coco/core/src/IR/InstrManager.test.cpp   |  2 +-
 6 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 contrib/coco/core/include/coco/IR/Op.forward.h

diff --git a/contrib/coco/core/include/coco/IR/Instr.h b/contrib/coco/core/include/coco/IR/Instr.h
index 70f1b1f..56a2001 100644
--- a/contrib/coco/core/include/coco/IR/Instr.h
+++ b/contrib/coco/core/include/coco/IR/Instr.h
@@ -79,15 +79,17 @@ public:
 //
 // UnitF
 //
+#include "coco/IR/Op.forward.h"
+
 namespace coco
 {
 
 /**
  * @brief Feature map-to-feature map step with single NN operation
  *
- * TODO Restrict 'OpImpl'
+ * TODO Introduce 'FeatureOp' and use it
  */
-template<typename OpImpl> class UnitF final : public FeatureInstr
+class UnitF final : public FeatureInstr
 {
 public:
   UnitF(const PtrLink<Instr, Block> *link) : FeatureInstr{link}, _op{nullptr}
@@ -96,13 +98,13 @@ public:
   }
 
 private:
-  OpImpl *_op;
+  Op *_op;
 
 public:
-  OpImpl *op(void) const { return _op; }
+  Op *op(void) const { return _op; }
 
 public:
-  void op(OpImpl *op)
+  void op(Op *op)
   {
     // TODO Update Op-Instr relation
     _op = op;
diff --git a/contrib/coco/core/include/coco/IR/InstrManager.h b/contrib/coco/core/include/coco/IR/InstrManager.h
index 580ae84..ecfde65 100644
--- a/contrib/coco/core/include/coco/IR/InstrManager.h
+++ b/contrib/coco/core/include/coco/IR/InstrManager.h
@@ -17,7 +17,7 @@ public:
   }
 
 public:
-  template<typename OpImpl> UnitF<OpImpl> *createF(void);
+  template<typename Ins> Ins *create(void);
 
 private:
   const PtrLink<Instr, Block> * const _instr_link;
diff --git a/contrib/coco/core/include/coco/IR/Op.forward.h b/contrib/coco/core/include/coco/IR/Op.forward.h
new file mode 100644
index 0000000..8db7044
--- /dev/null
+++ b/contrib/coco/core/include/coco/IR/Op.forward.h
@@ -0,0 +1,11 @@
+#ifndef __COCO_IR_OP_FORWARD_H__
+#define __COCO_IR_OP_FORWARD_H__
+
+namespace coco
+{
+
+struct Op;
+
+} // namespace coco
+
+#endif // __COCO_IR_OP_FORWARD_H__
diff --git a/contrib/coco/core/src/IR/Instr.test.cpp b/contrib/coco/core/src/IR/Instr.test.cpp
index 1b0fcb2..31ebaeb 100644
--- a/contrib/coco/core/src/IR/Instr.test.cpp
+++ b/contrib/coco/core/src/IR/Instr.test.cpp
@@ -56,7 +56,7 @@ struct DummyOp : public coco::Op
 TEST(IR_UNIT_F, ctor)
 {
   coco::PtrLink<coco::Instr, coco::Block> link;
-  coco::UnitF<::DummyOp> ins{&link};
+  coco::UnitF ins{&link};
 
   ASSERT_EQ(ins.op(), nullptr);
 }
@@ -64,7 +64,7 @@ TEST(IR_UNIT_F, ctor)
 TEST(IR_UNIT_F, op_update)
 {
   coco::PtrLink<coco::Instr, coco::Block> link;
-  coco::UnitF<::DummyOp> ins{&link};
+  coco::UnitF ins{&link};
 
   ::DummyOp op{};
 
diff --git a/contrib/coco/core/src/IR/InstrManager.cpp b/contrib/coco/core/src/IR/InstrManager.cpp
index 8fe525e..95993e1 100644
--- a/contrib/coco/core/src/IR/InstrManager.cpp
+++ b/contrib/coco/core/src/IR/InstrManager.cpp
@@ -7,9 +7,9 @@
 namespace coco
 {
 
-template<> UnitF<Conv2D> *InstrManager::createF()
+template<> UnitF *InstrManager::create(void)
 {
-  return take(nncc::foundation::make_unique<UnitF<Conv2D>>(_instr_link));
+  return take(nncc::foundation::make_unique<UnitF>(_instr_link));
 }
 
 } // namespace coco
diff --git a/contrib/coco/core/src/IR/InstrManager.test.cpp b/contrib/coco/core/src/IR/InstrManager.test.cpp
index 03f9e53..70968c2 100644
--- a/contrib/coco/core/src/IR/InstrManager.test.cpp
+++ b/contrib/coco/core/src/IR/InstrManager.test.cpp
@@ -10,7 +10,7 @@ TEST(IR_INSTR_MANAGER, create_UnitF)
 
   // Conv2D
   {
-    auto ins = mgr.createF<coco::Conv2D>();
+    auto ins = mgr.create<coco::UnitF>();
     ASSERT_NE(ins, nullptr);
   }
 }
-- 
2.7.4