From 15046bd7f74858207234d11ff83e8aa475234351 Mon Sep 17 00:00:00 2001 From: lianghao Date: Thu, 28 Jan 2021 20:42:18 +0800 Subject: [PATCH] warn check --- ge/executor/ge_executor.cc | 2 +- ge/graph/manager/graph_manager.cc | 4 ++-- ge/graph/partition/dynamic_shape_partition.cc | 17 ----------------- .../same_transdata_breadth_fusion_pass.cc | 2 +- ge/graph/preprocess/multi_batch_copy_graph.cc | 2 +- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/ge/executor/ge_executor.cc b/ge/executor/ge_executor.cc index af8237e0..70fc1e14 100755 --- a/ge/executor/ge_executor.cc +++ b/ge/executor/ge_executor.cc @@ -56,7 +56,7 @@ void GetGeTensorDescFromDomiInfo(std::vector &ge_descs, uint32_t idx = 0; for (auto desc_item : domi_descs) { ge::TensorDesc ge_desc; - ge_desc.SetName(desc_item.name); + ge_desc.SetName(desc_item.name.c_str()); ge_desc.SetDataType(static_cast(desc_item.data_type)); ge_desc.SetFormat(static_cast(formats[idx])); std::vector shape_dims; diff --git a/ge/graph/manager/graph_manager.cc b/ge/graph/manager/graph_manager.cc index b6598f11..3ded4c1b 100755 --- a/ge/graph/manager/graph_manager.cc +++ b/ge/graph/manager/graph_manager.cc @@ -3185,7 +3185,7 @@ Status GraphManager::SaveVariables(const Graph &graph, const std::vectorfirst; auto var_tensor = iter->second.GetTensorDesc(); - var_tensor.SetName(var_name); + var_tensor.SetName(var_name.c_str()); iter->second.SetTensorDesc(var_tensor); var_values.emplace_back(iter->second); } diff --git a/ge/graph/partition/dynamic_shape_partition.cc b/ge/graph/partition/dynamic_shape_partition.cc index 2a60765f..d110f79a 100755 --- a/ge/graph/partition/dynamic_shape_partition.cc +++ b/ge/graph/partition/dynamic_shape_partition.cc @@ -354,23 +354,6 @@ Status DynamicShapePartitioner::TopologicalSortClusters() { return SUCCESS; } -namespace { -static std::string ToString(const std::vector &clusters) { - if (clusters.empty()) { - return "()"; - } - std::stringstream ss; - ss << "("; - auto iter = clusters.begin(); - for (size_t i = 0; i < clusters.size() - 1; i++) { - ss << (*iter)->Id() << ","; - iter++; - } - ss << (*iter)->Id() << ")."; - return ss.str(); -} -} - void DynamicShapePartitioner::MergeClustersUnknownShape() { // Merge unknown shape clusters for (const auto &cluster : ordered_cluster_) { diff --git a/ge/graph/passes/same_transdata_breadth_fusion_pass.cc b/ge/graph/passes/same_transdata_breadth_fusion_pass.cc index ad8819e5..44778dd3 100644 --- a/ge/graph/passes/same_transdata_breadth_fusion_pass.cc +++ b/ge/graph/passes/same_transdata_breadth_fusion_pass.cc @@ -67,7 +67,7 @@ OpDescPtr SameTransdataBreadthFusionPass::GetCastOp(const GeTensorDesc &in_desc, auto fusion_cast_op_count = atomic_fusion_cast_op_count.fetch_add(1); std::stringstream cast_op_name; cast_op_name << "fusion_cast_" << fusion_cast_op_count; - auto node_op = ge::OperatorFactory::CreateOperator(cast_op_name.str(), CAST); + auto node_op = ge::OperatorFactory::CreateOperator(cast_op_name.str().c_str(), CAST); auto cast_op = ge::OpDescUtils::GetOpDescFromOperator(node_op); node_op.BreakConnect(); if (cast_op == nullptr) { diff --git a/ge/graph/preprocess/multi_batch_copy_graph.cc b/ge/graph/preprocess/multi_batch_copy_graph.cc index e43c5dd2..5e30a65a 100644 --- a/ge/graph/preprocess/multi_batch_copy_graph.cc +++ b/ge/graph/preprocess/multi_batch_copy_graph.cc @@ -600,7 +600,7 @@ Status MultiBatchGraphCopyer::LabelInBatchBranchStatus() { for (auto &in_node : node->GetInDataNodes()) { if (origin_nodes_status_.find(in_node.get()) != origin_nodes_status_.end()) { if (origin_nodes_status_.find(node.get()) == origin_nodes_status_.end()) { - origin_nodes_status_[node.get()] == kNodeInBatchBranch; + origin_nodes_status_[node.get()] = kNodeInBatchBranch; ResetEnterStatus(frame_enters, node); changed = true; }