From: 박천교/On-Device Lab(SR)/Engineer/삼성전자 <ch.bahk@samsung.com>
Date: Fri, 16 Aug 2019 01:43:42 +0000 (+0900)
Subject: [moco-tf] Register Reshape elimination transforms (#6624)
X-Git-Tag: accepted/tizen/unified/20190903.052428~367
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37745e563b7ed723591fb30969c74be7546822a1;p=platform%2Fcore%2Fml%2Fnnfw.git

[moco-tf] Register Reshape elimination transforms (#6624)

This commit registers following Reshape elimination transforms to
canonical optimization stage:
- ResolveDuplicateReshape
- ResolveRedundantReshape

Signed-off-by: Cheongyo Bahk <ch.bahk@samsung.com>
---

diff --git a/compiler/moco-tf/src/Optimizer.cpp b/compiler/moco-tf/src/Optimizer.cpp
index 819b40e..52347ae 100644
--- a/compiler/moco-tf/src/Optimizer.cpp
+++ b/compiler/moco-tf/src/Optimizer.cpp
@@ -29,6 +29,8 @@ namespace tf
 
 void Optimizer::optimize(loco::Graph *g) const
 {
+  // TODO Canonical Shape inference
+
   moco::tf::Phase phase;
 
   /* TRANSFORM DECLARATION BEGIN */
@@ -56,6 +58,16 @@ void Optimizer::optimize(loco::Graph *g) const
   {
     phase.emplace_back(stdex::make_unique<RemoveForwardNodeTransform>());
   }
+
+  if (moco::tf::get<moco::tf::Knob::ResolveDuplicateReshape>())
+  {
+    phase.emplace_back(stdex::make_unique<ResolveDuplicateReshape>());
+  }
+
+  if (moco::tf::get<moco::tf::Knob::ResolveRedundantReshape>())
+  {
+    phase.emplace_back(stdex::make_unique<ResolveRedundantReshape>());
+  }
   /* TRANSFORM DECLARATION END */
 
   moco::tf::PhaseRunner<moco::tf::PhaseStrategy::Saturate> phase_runner{g};
diff --git a/compiler/moco-tf/src/Transforms.h b/compiler/moco-tf/src/Transforms.h
index b108688..22913c1 100644
--- a/compiler/moco-tf/src/Transforms.h
+++ b/compiler/moco-tf/src/Transforms.h
@@ -25,7 +25,9 @@
 #include "Transforms/RemoveForwardNodeTransform.h"
 #include "Transforms/ReorderDecodeTransform.h"
 #include "Transforms/ResolveConstantShape.h"
+#include "Transforms/ResolveDuplicateReshape.h"
 #include "Transforms/ResolveFusedBatchNorm.h"
+#include "Transforms/ResolveRedundantReshape.h"
 #include "Transforms/ResolveReshapeWildcardDim.h"
 #include "Transforms/SimplifyDomainConversionTransform.h"