From 84253df880825d58466f4c40908a3f09d2280fbf Mon Sep 17 00:00:00 2001 From: dongduo Date: Thu, 10 Dec 2020 14:30:17 +0800 Subject: [PATCH] Fix code check --- .../load/new_model_manager/task_info/kernel_task_info.cc | 2 +- ge/graph/partition/engine_place.cc | 2 +- ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc | 4 ++-- ge/init/gelib.h | 6 +++--- ge/single_op/task/aicpu_kernel_task_builder.cc | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc b/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc index 163e3134..1f398309 100755 --- a/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc +++ b/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc @@ -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 diff --git a/ge/graph/partition/engine_place.cc b/ge/graph/partition/engine_place.cc index f4ebbdca..f71585dc 100755 --- a/ge/graph/partition/engine_place.cc +++ b/ge/graph/partition/engine_place.cc @@ -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(); diff --git a/ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc b/ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc index 3474b3cb..7330f616 100755 --- a/ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc +++ b/ge/hybrid/node_executor/aicpu/aicpu_node_executor.cc @@ -645,8 +645,8 @@ Status AicpuNodeTask::Init(const HybridModel &model) { auto kernel_type = static_cast(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."); } diff --git a/ge/init/gelib.h b/ge/init/gelib.h index e52b8dd6..c04dc898 100644 --- a/ge/init/gelib.h +++ b/ge/init/gelib.h @@ -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_; } diff --git a/ge/single_op/task/aicpu_kernel_task_builder.cc b/ge/single_op/task/aicpu_kernel_task_builder.cc index df592a87..cd218c94 100755 --- a/ge/single_op/task/aicpu_kernel_task_builder.cc +++ b/ge/single_op/task/aicpu_kernel_task_builder.cc @@ -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."); }