From f6f42e9555da4475f6d9c6995eb12abf15370e7a Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/On-Device=20Lab=28SR=29/Princip?=
 =?utf8?q?al=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?=
 <saehie.park@samsung.com>
Date: Wed, 4 Sep 2019 10:44:02 +0900
Subject: [PATCH] [moco-tf] Use logo for Canonicalizer (#7118)

This will revise Canonicalizer to use logo Phase and ProgressReporter

Signed-off-by: SaeHie Park <saehie.park@samsung.com>
---
 compiler/moco-tf/src/Canonicalizer.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/compiler/moco-tf/src/Canonicalizer.cpp b/compiler/moco-tf/src/Canonicalizer.cpp
index 3a0989d..c23371f 100644
--- a/compiler/moco-tf/src/Canonicalizer.cpp
+++ b/compiler/moco-tf/src/Canonicalizer.cpp
@@ -17,8 +17,7 @@
 #include "Canonicalizer.h"
 
 #include "Knob.h"
-#include "Phase.h"
-#include "Transforms.h"
+#include "ProgressReporter.h"
 
 #include "Transforms/ShapeInferencePass.h"
 #include "Transforms/TypeInferencePass.h"
@@ -49,6 +48,8 @@
 #include "Dialect/TFDialect.h"
 #include "Dialect/TFNodes.h"
 
+#include <logo/Phase.h>
+
 #include <stdex/Memory.h>
 
 #include <cassert>
@@ -81,7 +82,7 @@ namespace tf
 
 void Canonicalizer::canonicalize(loco::Graph *g) const
 {
-  moco::tf::Phase phase;
+  logo::Phase phase;
 
   /* TRANSFORM DECLARATION BEGIN */
   // Run shape and type inference at the top
@@ -112,7 +113,9 @@ void Canonicalizer::canonicalize(loco::Graph *g) const
   phase.emplace_back(stdex::make_unique<TanhCanonicalizer>());
   /* TRANSFORM DECLARATION END */
 
-  moco::tf::PhaseRunner<moco::tf::PhaseStrategy::Restart> phase_runner{g};
+  ProgressReporter prog(g, logo::PhaseStrategy::Restart);
+  logo::PhaseRunner<logo::PhaseStrategy::Restart> phase_runner{g};
+  phase_runner.attach(&prog);
   phase_runner.run(phase);
 
   // Assert if graph has TF dialect nodes
-- 
2.7.4