Browse Source

Fix code check

tags/v1.2.0
dongduo 4 years ago
parent
commit
84253df880
5 changed files with 9 additions and 9 deletions
  1. +1
    -1
      ge/graph/load/new_model_manager/task_info/kernel_task_info.cc
  2. +1
    -1
      ge/graph/partition/engine_place.cc
  3. +2
    -2
      ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc
  4. +3
    -3
      ge/init/gelib.h
  5. +2
    -2
      ge/single_op/task/aicpu_kernel_task_builder.cc

+ 1
- 1
ge/graph/load/new_model_manager/task_info/kernel_task_info.cc View File

@@ -884,7 +884,7 @@ Status KernelTaskInfo::InitAicpuTask(uint32_t op_index, const domi::KernelDef &k
if (kernel_type_ == ccKernelType::CUST_AI_CPU) {
bool loaded = false;
GE_CHK_STATUS_RET(ModelManager::GetInstance()->LoadCustAicpuSo(op_desc, so_name_, loaded),
"launch cust aicpu so failed");
"launch cust aicpu so failed");
}

// copy args to new host memory


+ 1
- 1
ge/graph/partition/engine_place.cc View File

@@ -56,7 +56,7 @@ Status EnginePlacer::Run() {
}
bool is_check_support_success = true;
// Assign engine for each node in the graph
ge::GELib::GetInstance()->DNNEngineManagerObj().InitPerformanceStaistic();
ge::GELib::GetInstance()->().InitPerformanceStaistic();
for (const auto &node_ptr : compute_graph_->GetDirectNode()) {
GE_CHECK_NOTNULL(node_ptr);
auto op_desc = node_ptr->GetOpDesc();


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

@@ -645,8 +645,8 @@ Status AicpuNodeTask::Init(const HybridModel &model) {
auto kernel_type = static_cast<ccKernelType>(context.kernel_type());
if (kernel_type == ccKernelType::CUST_AI_CPU) {
bool loaded = false;
GE_CHK_STATUS_RET(ModelManager::GetInstance()->LoadCustAicpuSo(op_desc, so_name, loaded),
"load cust aicpu so failed.");
GE_CHK_STATUS_RET(ModelManager::GetInstance()->LoadCustAicpuSo(op_desc, so_name, loaded),
"load cust aicpu so failed.");
if (!loaded) {
GE_CHK_STATUS_RET(ModelManager::GetInstance()->LaunchCustAicpuSo(), "Launch cust aicpu so failed.");
}


+ 3
- 3
ge/init/gelib.h View File

@@ -48,13 +48,13 @@ class GELib {
Status Finalize();

// get DNNEngineManager object
DNNEngineManager &DNNEngineManagerObj() { return engineManager_; }
DNNEngineManager &DNNEngineManagerObj() const { return engineManager_; }

// get OpsKernelManager object
OpsKernelManager &OpsKernelManagerObj() { return opsManager_; }
OpsKernelManager &OpsKernelManagerObj() const { return opsManager_; }

// get SessionManager object
SessionManager &SessionManagerObj() { return sessionManager_; }
SessionManager &SessionManagerObj() const { return sessionManager_; }

// get Initial flag
bool InitFlag() const { return init_flag_; }


+ 2
- 2
ge/single_op/task/aicpu_kernel_task_builder.cc View File

@@ -63,8 +63,8 @@ Status AiCpuCCTaskBuilder::BuildTask(AiCpuCCTask &task, uint64_t kernel_id) {
task.is_custom_ = true;
task.dump_flag_ |= RT_KERNEL_CUSTOM_AICPU;
bool loaded = false;
GE_CHK_STATUS_RET(ModelManager::GetInstance()->LoadCustAicpuSo(op_desc_, so_name, loaded),
"launch cust aicpu so failed");
GE_CHK_STATUS_RET(ModelManager::GetInstance()->LoadCustAicpuSo(op_desc_, so_name, loaded),
"launch cust aicpu so failed");
if (!loaded) {
GE_CHK_STATUS_RET(ModelManager::GetInstance()->LaunchCustAicpuSo(), "launch cust aicpu so failed.");
}


Loading…
Cancel
Save