From 552b67ab0e7acf1584fb5086c22434aefb21ea2f Mon Sep 17 00:00:00 2001
From: chenmai1102 <chenmai@huawei.com>
Date: Thu, 28 Apr 2022 14:47:41 +0800
Subject: [PATCH] fix scatternd op map and default precision mode in GE mode

---
 .../include/transform/graph_ir/op_adapter_map.h      |  2 +-
 mindspore/ccsrc/runtime/device/context_extends.cc    |  6 +++++-
 .../graph_ir/op_declare/selection_ops_declare.cc     | 12 +++++-------
 .../graph_ir/op_declare/selection_ops_declare.h      |  5 ++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mindspore/ccsrc/include/transform/graph_ir/op_adapter_map.h b/mindspore/ccsrc/include/transform/graph_ir/op_adapter_map.h
index 3a0818de4d5..255b6055ea8 100644
--- a/mindspore/ccsrc/include/transform/graph_ir/op_adapter_map.h
+++ b/mindspore/ccsrc/include/transform/graph_ir/op_adapter_map.h
@@ -112,7 +112,7 @@ constexpr const char kNameSGD[] = "SGD";
 constexpr const char kNameSigmoidCrossEntropyWithLogits[] = "SigmoidCrossEntropyWithLogits";
 constexpr const char kNameSigmoidCrossEntropyWithLogitsGrad[] = "SigmoidCrossEntropyWithLogitsGrad";
 constexpr const char kNameSigmoidCrossEntropyWithLogitsV2[] = "BCEWithLogitsLoss";
-constexpr const char kNameScatterNdD[] = "ScatterNd";
+constexpr const char kNameScatterNd[] = "ScatterNd";
 constexpr const char kNamePadD[] = "Pad";
 constexpr const char kNamePadV1[] = "PadV1";
 constexpr const char kNameMirrorPad[] = "MirrorPad";
diff --git a/mindspore/ccsrc/runtime/device/context_extends.cc b/mindspore/ccsrc/runtime/device/context_extends.cc
index 88977a9ac93..6dce778e42b 100644
--- a/mindspore/ccsrc/runtime/device/context_extends.cc
+++ b/mindspore/ccsrc/runtime/device/context_extends.cc
@@ -236,7 +236,11 @@ void GetGeOptions(const std::shared_ptr<MsContext> &ms_context_ptr, std::map<std
     MS_LOG(WARNING) << "Set proto lib path failed!";
   }
 
-  (*ge_options)["ge.exec.precision_mode"] = "force_fp16";
+  if (training == "1") {
+    (*ge_options)["ge.exec.precision_mode"] = "allow_fp32_to_fp16";
+  } else {
+    (*ge_options)["ge.exec.precision_mode"] = "force_fp16";
+  }
 
   // Disable the global variable acc, only enable it while adding training graph in pipeline
   (*ge_options)["ge.exec.variable_acc"] = "0";
diff --git a/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.cc b/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.cc
index d81931b25ab..594e050ee57 100644
--- a/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.cc
+++ b/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.cc
@@ -79,13 +79,11 @@ OUTPUT_MAP(GatherV2D) = {{0, OUTPUT_DESC(y)}};
 REG_ADPT_DESC(GatherV2D, prim::kPrimGather->name(), ADPT_DESC(GatherV2D))
 REG_ADPT_DESC(Gather, kNameGather, ADPT_DESC(GatherV2D))
 
-// ScatterNdD
-INPUT_MAP(ScatterNdD) = {{1, INPUT_DESC(indices)}, {2, INPUT_DESC(x)}};
-INPUT_ATTR_MAP(ScatterNdD) = {
-  {3, ATTR_DESC(shape, AnyTraits<std::vector<int64_t>>(), AnyTraits<std::vector<int64_t>>())}};
-ATTR_MAP(ScatterNdD) = EMPTY_ATTR_MAP;
-OUTPUT_MAP(ScatterNdD) = {{0, OUTPUT_DESC(y)}};
-REG_ADPT_DESC(ScatterNdD, kNameScatterNdD, ADPT_DESC(ScatterNdD))
+// ScatterNd
+INPUT_MAP(ScatterNd) = {{1, INPUT_DESC(indices)}, {2, INPUT_DESC(x)}, {3, INPUT_DESC(shape)}};
+ATTR_MAP(ScatterNd) = EMPTY_ATTR_MAP;
+OUTPUT_MAP(ScatterNd) = {{0, OUTPUT_DESC(y)}};
+REG_ADPT_DESC(ScatterNd, kNameScatterNd, ADPT_DESC(ScatterNd))
 
 // ScatterNonAliasingAdd
 INPUT_MAP(ScatterNonAliasingAdd) = {{1, INPUT_DESC(x)}, {2, INPUT_DESC(indices)}, {3, INPUT_DESC(updates)}};
diff --git a/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.h b/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.h
index 3906c847646..1e74469678b 100644
--- a/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.h
+++ b/mindspore/ccsrc/transform/graph_ir/op_declare/selection_ops_declare.h
@@ -27,9 +27,8 @@ DECLARE_OP_ADAPTER(SliceD)
 DECLARE_OP_USE_INPUT_ATTR(SliceD)
 DECLARE_OP_USE_OUTPUT(SliceD)
 
-DECLARE_OP_ADAPTER(ScatterNdD)
-DECLARE_OP_USE_INPUT_ATTR(ScatterNdD)
-DECLARE_OP_USE_OUTPUT(ScatterNdD)
+DECLARE_OP_ADAPTER(ScatterNd)
+DECLARE_OP_USE_OUTPUT(ScatterNd)
 
 DECLARE_OP_ADAPTER(ScatterNonAliasingAdd)
 DECLARE_OP_USE_OUTPUT(ScatterNonAliasingAdd)