Browse Source

fixed cmetrix issue

tags/v1.3.0
李磊 4 years ago
parent
commit
cea56074df
2 changed files with 8 additions and 3 deletions
  1. +7
    -3
      ge/graph/load/model_manager/task_info/kernel_task_info.cc
  2. +1
    -0
      ge/graph/load/model_manager/task_info/kernel_task_info.h

+ 7
- 3
ge/graph/load/model_manager/task_info/kernel_task_info.cc View File

@@ -414,8 +414,7 @@ Status KernelTaskInfo::SuperKernelDistribute() {
return SUCCESS; return SUCCESS;
} }


Status KernelTaskInfo::Distribute() {
GELOGD("KernelTaskInfo Distribute Start.");
void KernelTaskInfo::SetArgs() {
if (davinci_model_->IsKnownNode()) { if (davinci_model_->IsKnownNode()) {
if (kernel_type_ == ccKernelType::TE) { if (kernel_type_ == ccKernelType::TE) {
args_ = l2_buffer_on_ ? davinci_model_->GetCurrentHybridArgsAddr(hybrid_args_offset_) args_ = l2_buffer_on_ ? davinci_model_->GetCurrentHybridArgsAddr(hybrid_args_offset_)
@@ -425,6 +424,11 @@ Status KernelTaskInfo::Distribute() {
} }
GELOGI("Known node %s args addr %p, offset %u.", op_desc_->GetName().c_str(), args_, args_offset_); GELOGI("Known node %s args addr %p, offset %u.", op_desc_->GetName().c_str(), args_, args_offset_);
} }
}

Status KernelTaskInfo::Distribute() {
GELOGD("KernelTaskInfo Distribute Start.");
SetArgs();
rtError_t rt_ret = RT_ERROR_NONE; rtError_t rt_ret = RT_ERROR_NONE;
char skt_enable_env[MMPA_MAX_PATH] = { 0x00 }; char skt_enable_env[MMPA_MAX_PATH] = { 0x00 };
INT32 res = mmGetEnv("SKT_ENABLE", skt_enable_env, MMPA_MAX_PATH); INT32 res = mmGetEnv("SKT_ENABLE", skt_enable_env, MMPA_MAX_PATH);
@@ -1075,7 +1079,7 @@ Status KernelTaskInfo::InitAicpuTask(uint32_t op_index, const domi::KernelDef &k
return RT_ERROR_TO_GE_STATUS(rt_ret); return RT_ERROR_TO_GE_STATUS(rt_ret);
} }
InitDumpTask(sizeof(aicpu::AicpuParamHead)); InitDumpTask(sizeof(aicpu::AicpuParamHead));
if (kernel_type_ == ccKernelType::CUST_AI_CPU) { if (kernel_type_ == ccKernelType::CUST_AI_CPU) {
dump_flag_ |= RT_KERNEL_CUSTOM_AICPU; dump_flag_ |= RT_KERNEL_CUSTOM_AICPU;
} }


+ 1
- 0
ge/graph/load/model_manager/task_info/kernel_task_info.h View File

@@ -145,6 +145,7 @@ class KernelTaskInfo : public TaskInfo {
bool IsMarkedFirstNode(); bool IsMarkedFirstNode();
bool FirstCallSKTLaunchCheck(); bool FirstCallSKTLaunchCheck();
bool DoubleCallSKTSaveCheck(); bool DoubleCallSKTSaveCheck();
void SetArgs();


void *stub_func_; void *stub_func_;
void *args_; void *args_;


Loading…
Cancel
Save