From 33879614c5cdb46b0062c71f7e8ceb3a28f74b1f Mon Sep 17 00:00:00 2001
From: xuanyue <xuanyue@huawei.com>
Date: Mon, 29 Mar 2021 13:10:51 +0800
Subject: [PATCH] adjust global var

---
 mindspore/core/base/core_ops.h                            | 2 ++
 mindspore/lite/tools/optimizer/common/gllo_utils.h        | 2 --
 mindspore/lite/tools/optimizer/fusion/norm_fusion.cc      | 3 ++-
 mindspore/lite/tools/optimizer/fusion/onnx_gelu_fusion.cc | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mindspore/core/base/core_ops.h b/mindspore/core/base/core_ops.h
index 3e275a5d68..dfc8547e5a 100644
--- a/mindspore/core/base/core_ops.h
+++ b/mindspore/core/base/core_ops.h
@@ -538,6 +538,8 @@ inline const PrimitivePtr kPrimTileFusion = std::make_shared<Primitive>("TileFus
 inline const PrimitivePtr kPrimReduceFusion = std::make_shared<Primitive>("ReduceFusion");
 inline const PrimitivePtr kPrimLayerNormFusion = std::make_shared<Primitive>("LayerNormFusion");
 inline const PrimitivePtr kPrimDType = std::make_shared<Primitive>("DType");
+inline const PrimitivePtr kPrimDivFusion = std::make_shared<Primitive>("DivFusion");
+inline const PrimitivePtr kPrimErf = std::make_shared<Primitive>("Erf");
 
 class DoSignaturePrimitive : public Primitive {
  public:
diff --git a/mindspore/lite/tools/optimizer/common/gllo_utils.h b/mindspore/lite/tools/optimizer/common/gllo_utils.h
index 9b4cb989e4..3d6909338f 100644
--- a/mindspore/lite/tools/optimizer/common/gllo_utils.h
+++ b/mindspore/lite/tools/optimizer/common/gllo_utils.h
@@ -34,8 +34,6 @@ using mindspore::lite::RET_OK;
 using mindspore::lite::STATUS;
 namespace mindspore {
 namespace opt {
-inline const PrimitivePtr kPrimDivFusion = std::make_shared<Primitive>("DivFusion");
-inline const PrimitivePtr kPrimErf = std::make_shared<Primitive>("Erf");
 inline const PrimitivePtr kPrimMakeTupleV2 = std::make_shared<Primitive>("make_tuple");
 inline const PrimitivePtr kPrimIdentity = std::make_shared<Primitive>("Identity");
 constexpr auto kWeightFormat = "weight_format";
diff --git a/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc b/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc
index 9adef402f1..31b56b325e 100644
--- a/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc
+++ b/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc
@@ -297,7 +297,8 @@ const BaseRef OnnxLayerNormFusion::DefinePattern() const {
   VectorRef add1_ref =
     VectorRef({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimAddFusion>), mean2_ref, epsilon_});
   VectorRef sqrt_ref = VectorRef({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimSqrt>), add1_ref});
-  VectorRef div_ref = VectorRef({std::make_shared<CondVar>(IsSpecifiedNode<&kPrimDivFusion>), sub1_ref, sqrt_ref});
+  VectorRef div_ref =
+    VectorRef({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimDivFusion>), sub1_ref, sqrt_ref});
   VectorRef mul_ref = VectorRef({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimMulFusion>), gamma_, div_ref});
   VectorRef add2_ref = VectorRef({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimAddFusion>), mul_ref, beta_});
   return add2_ref;
diff --git a/mindspore/lite/tools/optimizer/fusion/onnx_gelu_fusion.cc b/mindspore/lite/tools/optimizer/fusion/onnx_gelu_fusion.cc
index 9fd478d40f..e5d6c7c11d 100644
--- a/mindspore/lite/tools/optimizer/fusion/onnx_gelu_fusion.cc
+++ b/mindspore/lite/tools/optimizer/fusion/onnx_gelu_fusion.cc
@@ -27,8 +27,8 @@ constexpr float MUL1_y = 0.5;
 
 // gelu(x) = 1/2 * x * [1 + erf(x / sqrt(2))]
 const BaseRef OnnxGeLUFusion::DefinePattern() const {
-  VectorRef div_ref({std::make_shared<CondVar>(IsSpecifiedNode<&kPrimDivFusion>), input_, div_y_});
-  VectorRef erf_ref({std::make_shared<CondVar>(IsSpecifiedNode<&kPrimErf>), div_ref});
+  VectorRef div_ref({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimDivFusion>), input_, div_y_});
+  VectorRef erf_ref({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimErf>), div_ref});
   VectorRef add_ref({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimAddFusion>), erf_ref, add_y_});
   VectorRef mul1_ref({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimMulFusion>), input_, mul1_y_});
   VectorRef mul2_ref({std::make_shared<CondVar>(IsSpecifiedNode<&prim::kPrimMulFusion>), mul1_ref, add_ref});