Pre Merge pull request !1042 from 梁昊/development

ge/executor/ge_executor.cc

@@ -56,7 +56,7 @@ void GetGeTensorDescFromDomiInfo(std::vector<ge::TensorDesc> &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<ge::DataType>(desc_item.data_type));
     ge_desc.SetFormat(static_cast<ge::Format>(formats[idx]));
     std::vector<int64_t> shape_dims;

ge/graph/manager/graph_manager.cc

@@ -3185,7 +3185,7 @@ Status GraphManager::SaveVariables(const Graph &graph, const std::vector<std::st
         return FAILED;
       } else {
         auto var_tensor = var_results[var_name].GetTensorDesc();
-        var_tensor.SetName(var_name);
+        var_tensor.SetName(var_name.c_str());
         var_results[var_name].SetTensorDesc(var_tensor);
         var_values.emplace_back(var_results[var_name]);
       }
@@ -3194,7 +3194,7 @@ Status GraphManager::SaveVariables(const Graph &graph, const std::vector<std::st
     for (auto iter = var_results.begin(); iter != var_results.end(); ++iter) {
       string var_name = iter->first;
       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);
     }

ge/graph/partition/dynamic_shape_partition.cc

@@ -354,23 +354,6 @@ Status DynamicShapePartitioner::TopologicalSortClusters() {
   return SUCCESS;
 }
 
-namespace {
-static std::string ToString(const std::vector<ClusterPtr> &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_) {

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) {

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;
           }