From ab7e841ada86dc226e9e208ba731b3ffeb9bd805 Mon Sep 17 00:00:00 2001
From: zhaozhixuan <zhaozhixuan2@hisilicon.com>
Date: Wed, 14 Apr 2021 09:04:57 +0800
Subject: [PATCH] Make NetOutput shape continuous.

---
 ge/hybrid/node_executor/aicore/aicore_node_executor.cc | 2 +-
 ge/hybrid/node_executor/aicore/aicore_node_executor.h  | 2 --
 ge/hybrid/node_executor/aicore/aicore_task_builder.cc  | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ge/hybrid/node_executor/aicore/aicore_node_executor.cc b/ge/hybrid/node_executor/aicore/aicore_node_executor.cc
index 2ce7fea2..29ae831c 100755
--- a/ge/hybrid/node_executor/aicore/aicore_node_executor.cc
+++ b/ge/hybrid/node_executor/aicore/aicore_node_executor.cc
@@ -216,7 +216,7 @@ Status AiCoreNodeTask::ExecuteAsync(TaskContext &context, std::function<void()>
     RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeLaunchKernel] End");
   }
 
-  if (done_callback != nullptr && !is_single_op_) {
+  if (done_callback != nullptr) {
     RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] Start");
     GE_CHK_STATUS_RET_NOLOG(context.RegisterCallback(done_callback));
     RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] End");
diff --git a/ge/hybrid/node_executor/aicore/aicore_node_executor.h b/ge/hybrid/node_executor/aicore/aicore_node_executor.h
index 74a28245..c352764d 100755
--- a/ge/hybrid/node_executor/aicore/aicore_node_executor.h
+++ b/ge/hybrid/node_executor/aicore/aicore_node_executor.h
@@ -61,12 +61,10 @@ class AiCoreNodeTask : public NodeTask {
 
   const vector<int64_t> &GetWorkspaceSizes() const;
   void SetWorkspaceSizes(const vector<int64_t> &workspace_sizes);
-  void SetSingleOp(bool is_single_op) {is_single_op_ = is_single_op;}
  private:
   Status CheckOverflow(TaskContext &context);
   std::vector<std::unique_ptr<AiCoreOpTask>> tasks_;
   std::vector<int64_t> workspace_sizes_;
-  bool is_single_op_ = false;
 };
 
 class AiCoreNodeExecutor : public NodeExecutor {
diff --git a/ge/hybrid/node_executor/aicore/aicore_task_builder.cc b/ge/hybrid/node_executor/aicore/aicore_task_builder.cc
index c615b7c3..114451b3 100755
--- a/ge/hybrid/node_executor/aicore/aicore_task_builder.cc
+++ b/ge/hybrid/node_executor/aicore/aicore_task_builder.cc
@@ -88,7 +88,6 @@ Status AiCoreTaskBuilder::BuildTask(std::unique_ptr<AiCoreNodeTask> &node_task,
 
   node_task.reset(new(std::nothrow)AiCoreNodeTask(std::move(op_tasks)));
   GE_CHECK_NOTNULL(node_task);
-  node_task->SetSingleOp(is_single_op);
   return SUCCESS;
 }