From 8befa0c5f894e0265cb70bfc03f4fc71f46a594b Mon Sep 17 00:00:00 2001
From: "gengchao4@huawei.com" <gengchao4@huawei.com>
Date: Fri, 6 Nov 2020 09:27:16 +0800
Subject: [PATCH] bugfix for mstune when build_step is after_merge

---
 ge/graph/manager/graph_manager.cc   | 14 ++++----------
 ge/graph/optimize/graph_optimize.cc |  3 ++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ge/graph/manager/graph_manager.cc b/ge/graph/manager/graph_manager.cc
index 4737955d..82931ffa 100755
--- a/ge/graph/manager/graph_manager.cc
+++ b/ge/graph/manager/graph_manager.cc
@@ -694,16 +694,10 @@ Status GraphManager::PreRun(const GraphNodePtr &graph_node, const std::vector<Ge
     }
   }
 
-
-  // BUILD_MODE_TUNING with BUILD_STEP_AFTER_MERGE no need PreRunOptimizeSubGraph.
-  bool run_optimize_subgraph =
-      !((options_.build_mode == BUILD_MODE_TUNING) && (options_.build_step == BUILD_STEP_AFTER_MERGE));
-  if (run_optimize_subgraph) {
-    Status ret = PreRunOptimizeSubGraph(graph_node, compute_graph, session_id);
-    if (ret != SUCCESS) {
-      GELOGE(ret, "Run PreRunOptimizeSubGraph failed for graph:%s.", compute_graph->GetName().c_str());
-      return ret;
-    }
+  ret = PreRunOptimizeSubGraph(graph_node, compute_graph, session_id);
+  if (ret != SUCCESS) {
+    GELOGE(ret, "Run PreRunOptimizeSubGraph failed for graph:%s.", compute_graph->GetName().c_str());
+    return ret;
   }
 
   /// 1. BUILD_MODE_TUNING with BUILD_STEP_BEFORE_UB_MATCH no need PreRunAfterOptimizeSubGraph;
diff --git a/ge/graph/optimize/graph_optimize.cc b/ge/graph/optimize/graph_optimize.cc
index ebf09afb..931d529b 100644
--- a/ge/graph/optimize/graph_optimize.cc
+++ b/ge/graph/optimize/graph_optimize.cc
@@ -101,7 +101,8 @@ Status GraphOptimize::OptimizeSubGraph(ComputeGraphPtr &compute_graph, const std
       return SUCCESS;
     }
 
-    if (build_mode_ == BUILD_MODE_TUNING && build_step_ == BUILD_STEP_AFTER_UB_MATCH) {
+    if (build_mode_ == BUILD_MODE_TUNING && (build_step_ == BUILD_STEP_AFTER_UB_MATCH
+      || build_step_ == BUILD_STEP_AFTER_MERGE)) {
       for (auto iter = graph_optimizer.begin(); iter != graph_optimizer.end(); ++iter) {
         Status ret = (*iter)->OptimizeFusedGraphAfterGraphSlice(*(compute_graph));
         if (ret != SUCCESS) {