From 70ae4b19c3766200384bcb53685d1a6dbab0f4b1 Mon Sep 17 00:00:00 2001
From: wangxiaotian22 <wangxiaotian4@huawei.com>
Date: Fri, 30 Oct 2020 15:20:23 +0800
Subject: [PATCH] fix hcom parelle sc check

---
 ge/graph/build/logical_stream_allocator.cc | 9 +++++++--
 ge/graph/build/logical_stream_allocator.h  | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ge/graph/build/logical_stream_allocator.cc b/ge/graph/build/logical_stream_allocator.cc
index 72337b26..81b2f182 100644
--- a/ge/graph/build/logical_stream_allocator.cc
+++ b/ge/graph/build/logical_stream_allocator.cc
@@ -462,7 +462,7 @@ Status AllReduceParallelPass::Run(ComputeGraphPtr graph, const vector<SubgraphPt
   set<NodePtr> all_reduce_succs;
 
   for (const NodePtr &node : graph->GetDirectNode()) {
-    if ((node->GetType() != HCOMALLREDUCE && node->GetType() != HVDCALLBACKALLREDUCE) ||
+    if (!IsHcomNode(node->GetType()) ||
         node->GetInDataNodes().size() <= 1) {
       continue;
     }
@@ -507,7 +507,7 @@ Status AllReduceParallelPass::Run(ComputeGraphPtr graph, const vector<SubgraphPt
         old_stream_to_new.emplace(old_stream, new_stream);
       }
 
-      if ((node->GetType() != HCOMALLREDUCE && node->GetType() != HVDCALLBACKALLREDUCE)) {
+      if (!IsHcomNode(node->GetType())) {
         GELOGI("Stream of node %s has been updated from %ld to %ld.", node->GetName().c_str(), old_stream, new_stream);
         node->GetOpDesc()->SetStreamId(new_stream);
       }
@@ -517,6 +517,11 @@ Status AllReduceParallelPass::Run(ComputeGraphPtr graph, const vector<SubgraphPt
   return !all_reduce_succs.empty() ? SUCCESS : NOT_CHANGED;
 }
 
+bool AllReduceParallelPass::IsHcomNode(const std::string& node_type) {
+  return (node_type == HCOMALLREDUCE || node_type == HVDCALLBACKALLREDUCE);
+}
+
+
 LogicalStreamAllocator::LogicalStreamAllocator(const map<string, SchedulerConf> &scheduler_confs,
                                                const map<string, int> &max_parallel_num)
     : scheduler_confs_(scheduler_confs), max_parallel_num_(max_parallel_num) {}
diff --git a/ge/graph/build/logical_stream_allocator.h b/ge/graph/build/logical_stream_allocator.h
index e09d7cd6..0aebb9b4 100644
--- a/ge/graph/build/logical_stream_allocator.h
+++ b/ge/graph/build/logical_stream_allocator.h
@@ -166,6 +166,8 @@ class AllReduceParallelPass : public LogicalStreamPass {
  public:
   STREAM_PASS_DEFAULT_FUNC(AllReduceParallelPass);
   Status Run(ComputeGraphPtr graph, const std::vector<SubgraphPtr> &subgraphs, Context &context) override;
+ private:
+  bool IsHcomNode(const std::string& node_type);
 };
 
 // Assign logical streams which is not limited by the number of tasks.