Browse Source

!1804 Aicpu single_op always dynamic execute.

From: @zhao_zhixuan
Reviewed-by: @xchu42,@wqtshg
Signed-off-by: @wqtshg
tags/v1.5.1
mindspore-ci-bot Gitee 3 years ago
parent
commit
e3491f1cbb
3 changed files with 2 additions and 7 deletions
  1. +2
    -2
      ge/hybrid/node_executor/aicore/aicore_op_task.cc
  2. +0
    -4
      ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc
  3. +0
    -1
      ge/single_op/task/op_task.cc

+ 2
- 2
ge/hybrid/node_executor/aicore/aicore_op_task.cc View File

@@ -81,7 +81,7 @@ Status AiCoreOpTask::Init(const OpDesc &op_desc, const domi::TaskDef &task_def)

Status AiCoreOpTask::RegisterTbeHandle(const OpDesc &op_desc) {
rtError_t rt_ret = rtQueryFunctionRegistered(stub_name_.c_str());
if (rt_ret != RT_ERROR_NONE || is_single_op_) {
if (rt_ret != RT_ERROR_NONE) {
auto op_desc_ptr = MakeShared<OpDesc>(op_desc);
GE_CHECK_NOTNULL(op_desc_ptr);
auto tbe_kernel = op_desc_ptr->TryGetExtAttr(GetKeyForTbeKernel(), TBEKernelPtr());
@@ -194,7 +194,7 @@ Status AiCoreOpTask::RegisterKernelHandle(const OpDesc &op_desc) {
Status AiCoreOpTask::InitWithKernelDef(const OpDesc &op_desc, const domi::TaskDef &task_def) {
const domi::KernelDef &kernel_def = task_def.kernel();
const domi::KernelContext &context = kernel_def.context();
stub_name_ = kernel_def.stub_func();
stub_name_ = is_single_op_ ? to_string(log_id_) + kernel_def.stub_func() : kernel_def.stub_func();
GE_CHK_STATUS_RET(RegisterTbeHandle(op_desc));
GE_CHK_RT_RET(rtGetFunctionByName(stub_name_.c_str(), &stub_func_));
args_size_ = kernel_def.args_size();


+ 0
- 4
ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc View File

@@ -64,10 +64,6 @@ Status AicpuNodeTaskBase::InitExtInfo(const std::string &kernel_ext_info, int64_
GE_CHK_STATUS_RET(aicpu_ext_handle_.UpdateSessionInfoSessionId(session_id),
"[Update][SessionInfoSessionId] failed, session_id:%ld.", session_id);

bool execute_mode = !aicpu_ext_handle_.IsNeedRefreshIOAddr() && !node_item_->is_dynamic;
GE_CHK_STATUS_RET(aicpu_ext_handle_.UpdateExecuteMode(execute_mode),
"[Update][ExecuteMode] failed, node:%s.", node_name_.c_str());

// copy task args buf
GE_CHK_STATUS_RET(AllocTensorBuffer(aicpu_ext_handle_.GetExtInfoLen(), ext_info_addr_dev_),
"[Invoke][AllocTensorBuffer]Node[%s] alloc kernel_ext_info buf failed, size=%zu",


+ 0
- 1
ge/single_op/task/op_task.cc View File

@@ -450,7 +450,6 @@ Status AiCpuBaseTask::SetExtInfoAndType(const std::string &kernel_ext_info, uint

GE_CHK_STATUS_RET(aicpu_ext_handle_->UpdateSessionInfo(ULLONG_MAX, kernel_id, false),
"[Update][SessionInfo] failed.");
GE_CHK_STATUS_RET(aicpu_ext_handle_->UpdateExecuteMode(true), "[Update][ExecuteMode] failed.");

GE_CHK_RT_RET(rtMalloc(&ext_info_addr_dev_, aicpu_ext_handle_->GetExtInfoLen(), RT_MEMORY_HBM));
GE_CHK_RT_RET(rtMemcpy(ext_info_addr_dev_, aicpu_ext_handle_->GetExtInfoLen(),


Loading…
Cancel
Save