From 30f397dbd636af1decad3533a170d5ecb41e364f Mon Sep 17 00:00:00 2001
From: Wei Luning <weiluning@huawei.com>
Date: Sat, 25 Apr 2020 19:50:24 +0800
Subject: [PATCH] Revert "use the old op"

This reverts commit 252ed4f7c99e02cba8622cfcec674ebf648e581f.
---
 .../ccsrc/optimizer/irpass/arithmetic_simplify.h   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.h b/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.h
index ff6e4f6170..0d48fc1463 100644
--- a/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.h
+++ b/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.h
@@ -248,18 +248,17 @@ class AdjustAllReduceMulAdd : public AnfVisitor {
     if (addn->size() != 2) {
       return nullptr;
     }
+
     AnfVisitor::Match(prim::kPrimMakeTuple, {IsNode, IsNode})(addn->input(1));
     if (x_ == nullptr || y_ == nullptr || z_ == nullptr) {
       return nullptr;
     }
 
-    auto addn_op_node = addn->input(0);
-    auto make_tuple_op_node = addn->input(1)->cast<CNodePtr>()->input(0);
     auto fg = node->func_graph();
-    AnfNodePtr tuple = NewCNode({make_tuple_op_node, z_, x_}, fg);
-    AnfNodePtr add = NewCNode({addn_op_node, tuple}, fg);
-    AnfNodePtr all_reduce = NewCNode({all_reduce_, add}, fg);
-    return NewCNode({mul_, all_reduce, y_}, fg);
+    AnfNodePtr tuple = NewCNode({NewValueNode(prim::kPrimMakeTuple), z_, x_}, fg);
+    AnfNodePtr add = NewCNode({NewValueNode(prim::kPrimAddN), tuple}, fg);
+    AnfNodePtr all_reduce = NewCNode({NewValueNode(prim::kPrimAllReduce), add}, fg);
+    return NewCNode({NewValueNode(prim::kPrimMul), all_reduce, y_}, fg);
   }
 
   void Visit(const AnfNodePtr &node) override {
@@ -270,7 +269,6 @@ class AdjustAllReduceMulAdd : public AnfVisitor {
       AnfVisitor::Match(prim::kPrimMul)(node);
       level_ = 0;
       if (is_reduce_match_) {
-        mul_ = node->cast<CNodePtr>()->input(0);
         y_ = tmp_;
       } else {
         z_ = node;
@@ -282,7 +280,6 @@ class AdjustAllReduceMulAdd : public AnfVisitor {
       if (IsPrimitiveCNode(node, prim::kPrimAllReduce)) {
         auto cnode = node->cast<CNodePtr>();
         if (cnode->size() > 1) {
-          all_reduce_ = cnode->input(0);
           x_ = cnode->input(1);
           is_reduce_match_ = true;
         }
@@ -305,7 +302,6 @@ class AdjustAllReduceMulAdd : public AnfVisitor {
   int level_{0};
   bool is_reduce_match_{false};
   AnfNodePtr x_{nullptr}, y_{nullptr}, z_{nullptr}, tmp_{nullptr};
-  AnfNodePtr all_reduce_{nullptr}, mul_{nullptr};
 };
 
 class ArithmeticSimplify {