已开启
refactor: HostCPU pass统一使用OpTypeUtils判断类型 #1
gentle-knight创建于 7月30日
refactor: HostCPU pass统一使用OpTypeUtils判断类型 #1
已开启
gentle-knight创建于 7月30日
1 个文件变更+5-5
@@ -11,6 +11,7 @@
11#include "graph/partition/optimizer/hostcpu_engine_update_pass.h"11#include "graph/partition/optimizer/hostcpu_engine_update_pass.h"
12#include "engines/manager/opskernel_manager/dnn_ops_kernel_manager.h"12#include "engines/manager/opskernel_manager/dnn_ops_kernel_manager.h"
13#include "graph/utils/node_utils.h"13#include "graph/utils/node_utils.h"
14+#include "graph/utils/op_type_utils.h"
14#include "common/checker.h"15#include "common/checker.h"
15#include "mmpa/mmpa_api.h"16#include "mmpa/mmpa_api.h"
16#include "graph/ge_local_context.h"17#include "graph/ge_local_context.h"
@@ -58,12 +59,11 @@ bool IsExecOnDevice(const OpDescPtr &op_desc) {
58}59}
59 60 
60bool IsConstOp(const OpDescPtr &op_desc) {61bool IsConstOp(const OpDescPtr &op_desc) {
61- return (strcmp(op_desc->GetTypePtr(), CONSTANT) == 0) || (strcmp(op_desc->GetTypePtr(), CONSTANTOP) == 0);62+ return OpTypeUtils::IsConstNode(op_desc->GetType());
62}63}
63 64 
64bool IsHostModelInputType(const OpDescPtr &op_desc) {65bool IsHostModelInputType(const OpDescPtr &op_desc) {
65- const auto type = op_desc->GetTypePtr();66+ return OpTypeUtils::IsDataNode(op_desc->GetType());
66- return (strcmp(type, DATA) == 0);
67}67}
68 68 
69bool IsHostInputAnchor(const OpDescPtr &op_desc) {69bool IsHostInputAnchor(const OpDescPtr &op_desc) {
@@ -294,7 +294,7 @@ Status HostcpuEngineUpdatePass::FindHostDataOfSubgraph(const ComputeGraphPtr &gr
294 }294 }
295 for (const auto &node : graph->GetDirectNode()) {295 for (const auto &node : graph->GetDirectNode()) {
296 GE_CHECK_NOTNULL(node);296 GE_CHECK_NOTNULL(node);
297- if (strcmp(node->GetTypePtr(), DATA) == 0) {297+ if (OpTypeUtils::IsDataNode(node->GetType())) {
298 NodePtr in_node = GetParentNode(node);298 NodePtr in_node = GetParentNode(node);
299 if ((in_node != nullptr) && IsExecOnHost(in_node)) {299 if ((in_node != nullptr) && IsExecOnHost(in_node)) {
300 if (host_exe_ops_.count(node) > 0U) {300 if (host_exe_ops_.count(node) > 0U) {
@@ -313,7 +313,7 @@ Status HostcpuEngineUpdatePass::FindHostDataOfSubgraph(const ComputeGraphPtr &gr
313Status HostcpuEngineUpdatePass::FindHostDataOfPartitionCall(const ComputeGraphPtr &graph, std::deque<NodePtr> &q) {313Status HostcpuEngineUpdatePass::FindHostDataOfPartitionCall(const ComputeGraphPtr &graph, std::deque<NodePtr> &q) {
314 for (const auto &node : graph->GetDirectNode()) {314 for (const auto &node : graph->GetDirectNode()) {
315 GE_CHECK_NOTNULL(node);315 GE_CHECK_NOTNULL(node);
316- if (strcmp(node->GetTypePtr(), DATA) == 0) {316+ if (OpTypeUtils::IsDataNode(node->GetType())) {
317 NodePtr in_node = nullptr;317 NodePtr in_node = nullptr;
318 GE_ASSERT_SUCCESS(NodeUtils::GetInNodeCrossPartionedCallNode(node, kDataInputIndex, in_node));318 GE_ASSERT_SUCCESS(NodeUtils::GetInNodeCrossPartionedCallNode(node, kDataInputIndex, in_node));
319 if (in_node == nullptr) {319 if (in_node == nullptr) {