From 84253df880825d58466f4c40908a3f09d2280fbf Mon Sep 17 00:00:00 2001 From: dongduo Date: Thu, 10 Dec 2020 14:30:17 +0800 Subject: [PATCH 1/6] 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."); } From c42fb4dc20cfa3752cf6a688b9a3faa063e2a31d Mon Sep 17 00:00:00 2001 From: dongduo Date: Thu, 10 Dec 2020 14:34:36 +0800 Subject: [PATCH 2/6] Fix code check --- ge/graph/partition/engine_place.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/graph/partition/engine_place.cc b/ge/graph/partition/engine_place.cc index f71585dc..f4ebbdca 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()->().InitPerformanceStaistic(); + ge::GELib::GetInstance()->DNNEngineManagerObj().InitPerformanceStaistic(); for (const auto &node_ptr : compute_graph_->GetDirectNode()) { GE_CHECK_NOTNULL(node_ptr); auto op_desc = node_ptr->GetOpDesc(); From 5ff32578df71418fb70dca2e799fd3e36bcd6dbe Mon Sep 17 00:00:00 2001 From: dongduo Date: Thu, 10 Dec 2020 16:28:23 +0800 Subject: [PATCH 3/6] Fix code check --- ge/init/gelib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ge/init/gelib.h b/ge/init/gelib.h index c04dc898..a2aca99d 100644 --- a/ge/init/gelib.h +++ b/ge/init/gelib.h @@ -48,13 +48,13 @@ class GELib { Status Finalize(); // get DNNEngineManager object - DNNEngineManager &DNNEngineManagerObj() const { return engineManager_; } + const DNNEngineManager &DNNEngineManagerObj() { return engineManager_; } // get OpsKernelManager object - OpsKernelManager &OpsKernelManagerObj() const { return opsManager_; } + const OpsKernelManager &OpsKernelManagerObj() { return opsManager_; } // get SessionManager object - SessionManager &SessionManagerObj() const { return sessionManager_; } + const SessionManager &SessionManagerObj() { return sessionManager_; } // get Initial flag bool InitFlag() const { return init_flag_; } From 71777a9931cdc357a72919ce3e31d05f5fba1016 Mon Sep 17 00:00:00 2001 From: dongduo Date: Thu, 10 Dec 2020 16:51:06 +0800 Subject: [PATCH 4/6] Fix code check --- ge/init/gelib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ge/init/gelib.h b/ge/init/gelib.h index a2aca99d..e52b8dd6 100644 --- a/ge/init/gelib.h +++ b/ge/init/gelib.h @@ -48,13 +48,13 @@ class GELib { Status Finalize(); // get DNNEngineManager object - const DNNEngineManager &DNNEngineManagerObj() { return engineManager_; } + DNNEngineManager &DNNEngineManagerObj() { return engineManager_; } // get OpsKernelManager object - const OpsKernelManager &OpsKernelManagerObj() { return opsManager_; } + OpsKernelManager &OpsKernelManagerObj() { return opsManager_; } // get SessionManager object - const SessionManager &SessionManagerObj() { return sessionManager_; } + SessionManager &SessionManagerObj() { return sessionManager_; } // get Initial flag bool InitFlag() const { return init_flag_; } From 9b3f6bd090d07ac63ca9ba2e190688cd3e282db5 Mon Sep 17 00:00:00 2001 From: dongduo Date: Thu, 10 Dec 2020 17:14:57 +0800 Subject: [PATCH 5/6] Fix code check --- ge/engine_manager/dnnengine_manager.cc | 4 ++-- ge/engine_manager/dnnengine_manager.h | 4 ++-- ge/init/gelib.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ge/engine_manager/dnnengine_manager.cc b/ge/engine_manager/dnnengine_manager.cc index b23993b6..777d2b38 100644 --- a/ge/engine_manager/dnnengine_manager.cc +++ b/ge/engine_manager/dnnengine_manager.cc @@ -158,7 +158,7 @@ std::shared_ptr DNNEngineManager::GetEngine(const std::string &na return nullptr; } -bool DNNEngineManager::IsEngineRegistered(const std::string &name) { +bool DNNEngineManager::IsEngineRegistered(const std::string &name) const { auto iter = engines_map_.find(name); if (iter != engines_map_.end()) { return true; @@ -177,7 +177,7 @@ const map &DNNEngineManager::GetCheckSupportCost() const { return checksupport_cost_; } -std::string DNNEngineManager::GetDNNEngineName(const ge::NodePtr &node_ptr) { +std::string DNNEngineManager::GetDNNEngineName(const ge::NodePtr &node_ptr) const { std::lock_guard lock(mutex_); GE_IF_BOOL_EXEC(node_ptr == nullptr, GELOGE(GE_CLI_GE_NOT_INITIALIZED, "DNNEngineManager: node_ptr is nullptr"); diff --git a/ge/engine_manager/dnnengine_manager.h b/ge/engine_manager/dnnengine_manager.h index c3ae5b95..4cc0b8cf 100755 --- a/ge/engine_manager/dnnengine_manager.h +++ b/ge/engine_manager/dnnengine_manager.h @@ -61,9 +61,9 @@ class DNNEngineManager { public: friend class GELib; std::shared_ptr GetEngine(const std::string &name) const; - bool IsEngineRegistered(const std::string &name); + bool IsEngineRegistered(const std::string &name) const; // If can't find appropriate engine name, return "", report error - string GetDNNEngineName(const ge::NodePtr &node_ptr); + string GetDNNEngineName(const ge::NodePtr &node_ptr) const; const map &GetSchedulers() const; const map &GetCheckSupportCost() const; void InitPerformanceStaistic(); diff --git a/ge/init/gelib.h b/ge/init/gelib.h index e52b8dd6..a2aca99d 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_; } + const DNNEngineManager &DNNEngineManagerObj() { return engineManager_; } // get OpsKernelManager object - OpsKernelManager &OpsKernelManagerObj() { return opsManager_; } + const OpsKernelManager &OpsKernelManagerObj() { return opsManager_; } // get SessionManager object - SessionManager &SessionManagerObj() { return sessionManager_; } + const SessionManager &SessionManagerObj() { return sessionManager_; } // get Initial flag bool InitFlag() const { return init_flag_; } From 6d73d06877e295a8526f38686ee84ad5748d974c Mon Sep 17 00:00:00 2001 From: dongduo Date: Thu, 10 Dec 2020 17:25:02 +0800 Subject: [PATCH 6/6] Fix code check --- ge/engine_manager/dnnengine_manager.cc | 4 ++-- ge/engine_manager/dnnengine_manager.h | 4 ++-- ge/init/gelib.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ge/engine_manager/dnnengine_manager.cc b/ge/engine_manager/dnnengine_manager.cc index 777d2b38..b23993b6 100644 --- a/ge/engine_manager/dnnengine_manager.cc +++ b/ge/engine_manager/dnnengine_manager.cc @@ -158,7 +158,7 @@ std::shared_ptr DNNEngineManager::GetEngine(const std::string &na return nullptr; } -bool DNNEngineManager::IsEngineRegistered(const std::string &name) const { +bool DNNEngineManager::IsEngineRegistered(const std::string &name) { auto iter = engines_map_.find(name); if (iter != engines_map_.end()) { return true; @@ -177,7 +177,7 @@ const map &DNNEngineManager::GetCheckSupportCost() const { return checksupport_cost_; } -std::string DNNEngineManager::GetDNNEngineName(const ge::NodePtr &node_ptr) const { +std::string DNNEngineManager::GetDNNEngineName(const ge::NodePtr &node_ptr) { std::lock_guard lock(mutex_); GE_IF_BOOL_EXEC(node_ptr == nullptr, GELOGE(GE_CLI_GE_NOT_INITIALIZED, "DNNEngineManager: node_ptr is nullptr"); diff --git a/ge/engine_manager/dnnengine_manager.h b/ge/engine_manager/dnnengine_manager.h index 4cc0b8cf..c3ae5b95 100755 --- a/ge/engine_manager/dnnengine_manager.h +++ b/ge/engine_manager/dnnengine_manager.h @@ -61,9 +61,9 @@ class DNNEngineManager { public: friend class GELib; std::shared_ptr GetEngine(const std::string &name) const; - bool IsEngineRegistered(const std::string &name) const; + bool IsEngineRegistered(const std::string &name); // If can't find appropriate engine name, return "", report error - string GetDNNEngineName(const ge::NodePtr &node_ptr) const; + string GetDNNEngineName(const ge::NodePtr &node_ptr); const map &GetSchedulers() const; const map &GetCheckSupportCost() const; void InitPerformanceStaistic(); diff --git a/ge/init/gelib.h b/ge/init/gelib.h index a2aca99d..e52b8dd6 100644 --- a/ge/init/gelib.h +++ b/ge/init/gelib.h @@ -48,13 +48,13 @@ class GELib { Status Finalize(); // get DNNEngineManager object - const DNNEngineManager &DNNEngineManagerObj() { return engineManager_; } + DNNEngineManager &DNNEngineManagerObj() { return engineManager_; } // get OpsKernelManager object - const OpsKernelManager &OpsKernelManagerObj() { return opsManager_; } + OpsKernelManager &OpsKernelManagerObj() { return opsManager_; } // get SessionManager object - const SessionManager &SessionManagerObj() { return sessionManager_; } + SessionManager &SessionManagerObj() { return sessionManager_; } // get Initial flag bool InitFlag() const { return init_flag_; }