From 9b8f0e3b5e847c8381e30e636ce1fdd28cd57fdf Mon Sep 17 00:00:00 2001
From: lvliang <lvliang18@huawei.com>
Date: Tue, 10 Nov 2020 11:05:39 +0800
Subject: [PATCH] fix-bug-of-repeated-graph-id-when-run-dynamic-op-in-pynative

---
 mindspore/ccsrc/backend/session/ascend_session.cc | 4 +++-
 mindspore/ccsrc/backend/session/session_basic.cc  | 4 ++--
 mindspore/ccsrc/backend/session/session_basic.h   | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mindspore/ccsrc/backend/session/ascend_session.cc b/mindspore/ccsrc/backend/session/ascend_session.cc
index 319c9719d5..f61c15e415 100644
--- a/mindspore/ccsrc/backend/session/ascend_session.cc
+++ b/mindspore/ccsrc/backend/session/ascend_session.cc
@@ -402,7 +402,9 @@ void AscendSession::RunOpImpl(const OpRunInfo &op_run_info, const GraphInfo &gra
   // malloc mem
   RunOpMemoryAlloc(op_run_info.value, input_tensors, graph.get());
   // Build dynamic kernel
-  BuildDynamicKernel(graph);
+  if (op_run_info.is_dynamic_shape) {
+    BuildDynamicKernel(graph);
+  }
   // load input data to device
   LoadInputData(graph, input_tensors);
   // run op
diff --git a/mindspore/ccsrc/backend/session/session_basic.cc b/mindspore/ccsrc/backend/session/session_basic.cc
index 1048f15246..2890d42fca 100644
--- a/mindspore/ccsrc/backend/session/session_basic.cc
+++ b/mindspore/ccsrc/backend/session/session_basic.cc
@@ -1322,8 +1322,8 @@ std::shared_ptr<KernelGraph> SessionBasic::ConstructSingleOpGraph(const OpRunInf
                                                                   const std::vector<tensor::TensorPtr> &input_tensors,
                                                                   const std::vector<int64_t> &tensors_mask) {
   auto graph = std::make_shared<KernelGraph>();
-  graph->set_graph_id(run_op_graph_id_);
-  run_op_graph_id_++;
+  graph->set_graph_id(graph_sum_);
+  graph_sum_++;
   std::vector<AnfNodePtr> inputs;
   // set input[0]
   PrimitivePtr op_prim = op_run_info.primitive;
diff --git a/mindspore/ccsrc/backend/session/session_basic.h b/mindspore/ccsrc/backend/session/session_basic.h
index 3f0c2d80b1..3c44ed15f5 100644
--- a/mindspore/ccsrc/backend/session/session_basic.h
+++ b/mindspore/ccsrc/backend/session/session_basic.h
@@ -56,7 +56,7 @@ using OpRunInfoPtr = std::shared_ptr<OpRunInfo>;
 class Executor;
 class SessionBasic : public std::enable_shared_from_this<SessionBasic> {
  public:
-  SessionBasic() : context_(nullptr), summary_callback_(nullptr), device_id_(0), run_op_graph_id_(0) {
+  SessionBasic() : context_(nullptr), summary_callback_(nullptr), device_id_(0) {
 #if !defined(_WIN32) && !defined(_WIN64)
     debugger_ = nullptr;
 #endif
@@ -184,7 +184,6 @@ class SessionBasic : public std::enable_shared_from_this<SessionBasic> {
   CallBackFunc summary_callback_;
   static GraphId graph_sum_;
   uint32_t device_id_;
-  uint32_t run_op_graph_id_;
   std::shared_ptr<Executor> executor_;
 #if !defined(_WIN32) && !defined(_WIN64)
   std::shared_ptr<Debugger> debugger_;