From 5273e91ee0580bbf90f2a38f0d88a17e8306c373 Mon Sep 17 00:00:00 2001
From: strickland12 <39791050+strickland12@users.noreply.github.com>
Date: Sun, 19 Aug 2018 13:11:36 +0800
Subject: [PATCH] rm MdUpdt chain merge (#1135)

* rm MdUpdt chain merge

* use area_id == kMdUpdtArea

* rm judgement

* refine IsSubset


Former-commit-id: f9fe1ee07b2b9fd941d6e33e8581056c3b0518e5
---
 oneflow/core/graph/chain_graph.cpp | 3 +++
 oneflow/core/graph/task_node.cpp   | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/oneflow/core/graph/chain_graph.cpp b/oneflow/core/graph/chain_graph.cpp
index 16c5b9c966..af179e43b9 100644
--- a/oneflow/core/graph/chain_graph.cpp
+++ b/oneflow/core/graph/chain_graph.cpp
@@ -79,6 +79,9 @@ void ChainMerger::InitChains() {
 }
 
 bool ChainMerger::DoMerge(std::list<ChainIt>& chains, ChainIt rhs) {
+  CHECK_EQ(rhs->nodes.size(), 1);
+  // rm kMdUpdtArea chain merge
+  if (rhs->nodes.front()->area_id() == kMdUpdtArea) { return false; }
   for (auto chains_it = chains.rbegin(); chains_it != chains.rend(); ++chains_it) {
     ChainIt lhs = *chains_it;
     if (IsSubset(lhs, rhs)) {
diff --git a/oneflow/core/graph/task_node.cpp b/oneflow/core/graph/task_node.cpp
index 069c755c52..859ad61bd6 100644
--- a/oneflow/core/graph/task_node.cpp
+++ b/oneflow/core/graph/task_node.cpp
@@ -142,10 +142,6 @@ int64_t TaskNode::MemZoneId121() const {
 
 void TaskNode::BuildCtrlRegstDescIfNeed(TaskNode* dst_node) {
   if (IsMeaningLess() || dst_node->IsMeaningLess()) { return; }
-  if (!Global<JobDesc>::Get()->IsTrain() && GetTaskType() == kNormalMdUpdt
-      && dst_node->GetTaskType() == kNormalMdUpdt) {
-    return;
-  }
   const auto& dst_ancestors = dst_node->ancestors();
   if (dst_ancestors.find(this) != dst_ancestors.end()) return;
   BuildCtrlRegstDesc(dst_node);
-- 
GitLab