[moco-tf] Use logo Pass (#7030)

* [moco-tf] Use logo Pass

This will update to use logo Pass as transformations for two Optimiziers

Signed-off-by: SaeHie Park <saehie.park@samsung.com>
* use moco::tf::Knob

diff --git a/compiler/moco-tf/src/Optimizer.cpp b/compiler/moco-tf/src/Optimizer.cpp
index 6f3f761..fee4d02 100644 (file)
--- a/compiler/moco-tf/src/Optimizer.cpp
+++ b/compiler/moco-tf/src/Optimizer.cpp
@@ -37,37 +37,44 @@ void Optimizer::optimize(loco::Graph *g) const
 
   if (moco::tf::get<moco::tf::Knob::ConstantFolding>())
   {
-    phase.emplace_back(stdex::make_unique<ConstantFoldingTransform>());
+    phase.emplace_back(stdex::make_unique<logo::ConstantFoldingPass>());
   }
 
   if (moco::tf::get<moco::tf::Knob::RemoveDeadNode>())
   {
-    phase.emplace_back(stdex::make_unique<RemoveDeadNodeTransform>());
+    phase.emplace_back(stdex::make_unique<logo::RemoveDeadNodePass>());
   }
 
-  if (moco::tf::get<moco::tf::Knob::ReorderDecode>())
+  if (moco::tf::get<moco::tf::Knob::ReorderDecode>() &&
+      moco::tf::get<moco::tf::Knob::ReorderDecodeTensorBiasAdd>())
   {
-    phase.emplace_back(stdex::make_unique<ReorderDecodeTransform>());
+    phase.emplace_back(stdex::make_unique<logo::ReorderDecodePass<loco::TensorBiasAdd>>());
+  }
+
+  if (moco::tf::get<moco::tf::Knob::ReorderDecode>() &&
+      moco::tf::get<moco::tf::Knob::ReorderDecodeReLU>())
+  {
+    phase.emplace_back(stdex::make_unique<logo::ReorderDecodePass<loco::ReLU>>());
   }
 
   if (moco::tf::get<moco::tf::Knob::SimplifyDomainConversion>())
   {
-    phase.emplace_back(stdex::make_unique<SimplifyDomainConversionTransform>());
+    phase.emplace_back(stdex::make_unique<logo::SimplifyDomainConversionPass>());
   }
 
   if (moco::tf::get<moco::tf::Knob::RemoveForwardNode>())
   {
-    phase.emplace_back(stdex::make_unique<RemoveForwardNodeTransform>());
+    phase.emplace_back(stdex::make_unique<logo::RemoveForwardNodePass>());
   }
 
   if (moco::tf::get<moco::tf::Knob::ResolveDuplicateReshape>())
   {
-    phase.emplace_back(stdex::make_unique<ResolveDuplicateReshape>());
+    phase.emplace_back(stdex::make_unique<logo::ResolveDuplicateReshapePass>());
   }
 
   if (moco::tf::get<moco::tf::Knob::ResolveRedundantReshape>())
   {
-    phase.emplace_back(stdex::make_unique<ResolveRedundantReshape>());
+    phase.emplace_back(stdex::make_unique<logo::ResolveRedundantReshapePass>());
   }
   /* TRANSFORM DECLARATION END */
 

diff --git a/compiler/moco-tf/src/TFOptimizer.cpp b/compiler/moco-tf/src/TFOptimizer.cpp
index 7a5da5f..22154cd 100644 (file)
--- a/compiler/moco-tf/src/TFOptimizer.cpp
+++ b/compiler/moco-tf/src/TFOptimizer.cpp
@@ -54,7 +54,7 @@ void TFOptimizer::optimize(loco::Graph *g) const
   }
   if (moco::tf::get<moco::tf::Knob::RemoveDeadNode>())
   {
-    phase.emplace_back(stdex::make_unique<RemoveDeadNodeTransform>());
+    phase.emplace_back(stdex::make_unique<logo::RemoveDeadNodePass>());
   }
   // Fix shape and pad for added nodes doing above transformations
   // TODO need to merge or remove the ones in importer

diff --git a/compiler/moco-tf/src/Transforms.h b/compiler/moco-tf/src/Transforms.h
index edcb3d2..4b5ece1 100644 (file)
--- a/compiler/moco-tf/src/Transforms.h
+++ b/compiler/moco-tf/src/Transforms.h
@@ -18,19 +18,14 @@
 #define __MOCO_TF_TRANSFORMS_H__
 
 #include "Transforms/ClearAnnotTransform.h"
-#include "Transforms/ConstantFoldingTransform.h"
 #include "Transforms/FixShapeTransform.h"
 #include "Transforms/FuseBinaryIntoPreceding.h"
-#include "Transforms/RemoveDeadNodeTransform.h"
-#include "Transforms/RemoveForwardNodeTransform.h"
 #include "Transforms/RemoveTFIdentityNodeTransform.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"
 #include "Transforms/ShapeInferencePass.h"
 
+#include <logo/Passes.h>
+
 #endif // __MOCO_TF_TRANSFORMS_H__