From b9cfbed631d1eba523d6cb8242fa4def37b7c24a Mon Sep 17 00:00:00 2001
From: kswang <wangkaisheng2@huawei.com>
Date: Mon, 11 Jan 2021 21:37:50 +0800
Subject: [PATCH] codex fix for executor

---
 mindspore/ccsrc/backend/session/executor.cc | 16 ++++------------
 mindspore/ccsrc/backend/session/executor.h  |  8 ++------
 mindspore/ccsrc/vm/graph_partition.cc       | 12 ++++++------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/mindspore/ccsrc/backend/session/executor.cc b/mindspore/ccsrc/backend/session/executor.cc
index b0eec577d4..6430f5e606 100644
--- a/mindspore/ccsrc/backend/session/executor.cc
+++ b/mindspore/ccsrc/backend/session/executor.cc
@@ -232,9 +232,7 @@ void Executor::OnException() {
   }
   {
     std::lock_guard<std::mutex> lock(pending_task_mutex_);
-    for (auto iter = pending_tasks_.begin(); iter != pending_tasks_.end(); ++iter) {
-      new_done_tasks.emplace_back(*iter);
-    }
+    std::copy(pending_tasks_.begin(), pending_tasks_.end(), std::back_inserter(new_done_tasks));
     pending_tasks_.clear();
   }
   {
@@ -249,7 +247,7 @@ void Executor::OnRunGraphFinished() {
   for (auto &task : new_ready_tasks) {
     ready_tasks_.push(task);
   }
-  if (new_ready_tasks.size() > 0) {
+  if (!new_ready_tasks.empty()) {
     task_cond_var_.notify_all();
   }
   reenter_cond_var_.notify_all();
@@ -288,15 +286,9 @@ void Executor::RunTask(const std::shared_ptr<Task> &task, bool sync, bool long_r
     std::unique_lock<std::mutex> lock(task_mutex_);
     if (long_run) {
       mindspore::ScopedLongRunning long_running;
-      sync_cond_var_.wait(lock, [this] {
-        bool finished = sync_run_task_finished_;
-        return finished;
-      });
+      sync_cond_var_.wait(lock, [this] { return sync_run_task_finished_; });
     } else {
-      sync_cond_var_.wait(lock, [this] {
-        bool finished = sync_run_task_finished_;
-        return finished;
-      });
+      sync_cond_var_.wait(lock, [this] { return sync_run_task_finished_; });
     }
   }
   ClearDoneTasks();
diff --git a/mindspore/ccsrc/backend/session/executor.h b/mindspore/ccsrc/backend/session/executor.h
index f4e543e19b..978e0a2ef6 100644
--- a/mindspore/ccsrc/backend/session/executor.h
+++ b/mindspore/ccsrc/backend/session/executor.h
@@ -42,7 +42,6 @@ enum TaskType {
   kCompileNodes,
   kCompileGraph,
   kBuildGraph,
-  kBuildOp,
   kRunGraph,
   kRunOp,
   kCreateCommGroup,
@@ -117,7 +116,7 @@ class RunOpTask : public Task {
   void Run() override;
   OpRunInfo *op_run_info_{nullptr};
   GraphInfo graph_info_;
-  std::vector<tensor::TensorPtr> *input_tensors_;
+  std::vector<tensor::TensorPtr> *input_tensors_{nullptr};
   VectorRef outputs_;
   std::vector<int64_t> tensors_mask_;
 };
@@ -173,12 +172,9 @@ class Executor {
 
  private:
   void RunTask(const std::shared_ptr<Task> &task, bool sync, bool long_run = false);
-  void UpdateOutputTensors(VectorRef *outputs,
-                           const std::map<tensor::TensorPtr, session::KernelWithIndex> &tensor_to_node);
   std::vector<std::shared_ptr<RunGraphTask>> GetNewReadyTasks();
   bool IsTaskReady(const std::shared_ptr<RunGraphTask> &task);
   void WaitTaskGraphAvailable(const SessionPtr &session, const std::shared_ptr<RunGraphTask> &task);
-  void CheckException();
   void OnWorkerExit();
   void OnRunGraphFinished();
   void OnException();
@@ -197,7 +193,7 @@ class Executor {
   std::list<std::shared_ptr<RunGraphTask>> pending_tasks_;
   std::vector<std::shared_ptr<Task>> done_tasks_;
   std::shared_ptr<std::thread> worker_;
-  std::atomic_bool sync_run_task_finished_{false};
+  bool sync_run_task_finished_{false};
 };
 }  // namespace session
 }  // namespace mindspore
diff --git a/mindspore/ccsrc/vm/graph_partition.cc b/mindspore/ccsrc/vm/graph_partition.cc
index 932999816a..20113692e6 100644
--- a/mindspore/ccsrc/vm/graph_partition.cc
+++ b/mindspore/ccsrc/vm/graph_partition.cc
@@ -98,7 +98,7 @@ void AddControlEdge(const FuncGraphPtr &graph, const AnfNodePtr &node,
   auto depend_node = input_cnode->input(kControlDependBehindIndex);
   MS_EXCEPTION_IF_NULL(prior_node);
   MS_EXCEPTION_IF_NULL(depend_node);
-  PrimitivePtr prim_ptr = GetValueNode<PrimitivePtr>(input_cnode->input(0));
+  auto prim_ptr = GetValueNode<PrimitivePtr>(input_cnode->input(0));
   MS_EXCEPTION_IF_NULL(prim_ptr);
   ValuePtr mode_ptr = prim_ptr->GetAttr("depend_mode");
   int64_t depend_mode = 0;
@@ -214,7 +214,7 @@ std::vector<AnfNodePtr> SplitSort(const FuncGraphPtr &graph, const std::string &
   std::map<AnfNodePtr, std::vector<AnfNodePtr>> control_edges;
   CalcNodeRefCount(graph, &nodes_ref, &control_edges);
   std::string handle_target = default_target;
-  std::string next_target = "";
+  std::string next_target;
   to_visit.push(graph->get_return());
   while (!to_visit.empty() || !next_to_visit.empty()) {
     if (to_visit.empty()) {
@@ -590,10 +590,10 @@ struct SplitDynamicNodesHelper {
     if (pre_nodes.size() < merge_node_threshold) {
       AddSegment(pre_nodes, segments, node_to_segment);
     } else {
-      if (pre_common_nodes.size() > 0) {
+      if (!pre_common_nodes.empty()) {
         AddSegment(pre_common_nodes, segments, node_to_segment);
       }
-      if (pre_dynamic_nodes.size() > 0) {
+      if (!pre_dynamic_nodes.empty()) {
         AddSegment(pre_dynamic_nodes, segments, node_to_segment);
       }
     }
@@ -656,7 +656,7 @@ void SplitDynamicNodeSegment(const std::vector<AnfNodePtr> &segment_nodes, std::
 
 void NodesToSegments(const std::vector<AnfNodePtr> &segment_nodes, std::vector<GraphSegmentPtr> *segments,
                      std::map<AnfNodePtr, GraphSegmentPtr> *node_to_segment) {
-  if (segment_nodes.size() == 0) {
+  if (segment_nodes.empty()) {
     return;
   }
   auto segment_target = GetCNodeTarget(segment_nodes[0]);
@@ -702,7 +702,7 @@ bool GraphPartition::IsCut(const AnfNodePtr &node) {
     if (!IsValueNode<Primitive>(fn)) {
       return true;
     }
-    PrimitivePtr node_prim = GetValueNode<PrimitivePtr>(fn);
+    auto node_prim = GetValueNode<PrimitivePtr>(fn);
     for (auto &prim : cut_list_) {
       MS_EXCEPTION_IF_NULL(prim);
       if (prim->name() == node_prim->name()) {