Browse Source

Make NetOutput shape continuous.

pull/1514/head
zhaozhixuan 4 years ago
parent
commit
ab7e841ada
3 changed files with 1 additions and 4 deletions
  1. +1
    -1
      ge/hybrid/node_executor/aicore/aicore_node_executor.cc
  2. +0
    -2
      ge/hybrid/node_executor/aicore/aicore_node_executor.h
  3. +0
    -1
      ge/hybrid/node_executor/aicore/aicore_task_builder.cc

+ 1
- 1
ge/hybrid/node_executor/aicore/aicore_node_executor.cc View File

@@ -216,7 +216,7 @@ Status AiCoreNodeTask::ExecuteAsync(TaskContext &context, std::function<void()>
RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeLaunchKernel] End"); 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"); RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] Start");
GE_CHK_STATUS_RET_NOLOG(context.RegisterCallback(done_callback)); GE_CHK_STATUS_RET_NOLOG(context.RegisterCallback(done_callback));
RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] End"); RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] End");


+ 0
- 2
ge/hybrid/node_executor/aicore/aicore_node_executor.h View File

@@ -61,12 +61,10 @@ class AiCoreNodeTask : public NodeTask {


const vector<int64_t> &GetWorkspaceSizes() const; const vector<int64_t> &GetWorkspaceSizes() const;
void SetWorkspaceSizes(const vector<int64_t> &workspace_sizes); void SetWorkspaceSizes(const vector<int64_t> &workspace_sizes);
void SetSingleOp(bool is_single_op) {is_single_op_ = is_single_op;}
private: private:
Status CheckOverflow(TaskContext &context); Status CheckOverflow(TaskContext &context);
std::vector<std::unique_ptr<AiCoreOpTask>> tasks_; std::vector<std::unique_ptr<AiCoreOpTask>> tasks_;
std::vector<int64_t> workspace_sizes_; std::vector<int64_t> workspace_sizes_;
bool is_single_op_ = false;
}; };


class AiCoreNodeExecutor : public NodeExecutor { class AiCoreNodeExecutor : public NodeExecutor {


+ 0
- 1
ge/hybrid/node_executor/aicore/aicore_task_builder.cc View File

@@ -88,7 +88,6 @@ Status AiCoreTaskBuilder::BuildTask(std::unique_ptr<AiCoreNodeTask> &node_task,


node_task.reset(new(std::nothrow)AiCoreNodeTask(std::move(op_tasks))); node_task.reset(new(std::nothrow)AiCoreNodeTask(std::move(op_tasks)));
GE_CHECK_NOTNULL(node_task); GE_CHECK_NOTNULL(node_task);
node_task->SetSingleOp(is_single_op);
return SUCCESS; return SUCCESS;
} }




Loading…
Cancel
Save