Pre Merge pull request !1773 from zhengyuanhua/master

metadef

@@ -1 +1 @@
-Subproject commit b27915cd37919430a61953f8998b7acce4a60177
+Subproject commit c6030152c6dc05515115765babb5d64fde649df4

parser

@@ -1 +1 @@
-Subproject commit e75eda62de2b51a0bded5481ca81eb8fc7bf376e
+Subproject commit 155d3262ba17f800094abb58b6a809b041cf0a74

tests/ut/common/graph/testcase/ge_graph/ge_graph_anchor_unittest.cc

@@ -272,115 +272,3 @@ TEST_F(UtestGeAnchor, graph_utils_test) {
   EXPECT_EQ(GraphUtils::RemoveEdge(conv_node->GetOutDataAnchor(0), bn_node->GetInControlAnchor()), GRAPH_SUCCESS);
   EXPECT_EQ(GraphUtils::RemoveEdge(conv_node->GetOutDataAnchor(0), bn_node->GetInControlAnchor()), GRAPH_FAILED);
 }
-
-TEST_F(UtestGeAnchor, data_anchor_replace_peer) {
-  ComputeGraphPtr graph_ptr = std::make_shared<ComputeGraph>("graph");
-  OpDescPtr in_op_ptr = std::make_shared<OpDesc>("in_op_1", "float");
-  in_op_ptr->AddInputDesc("x1", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddInputDesc("x2", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddInputDesc("x3", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddOutputDesc("y1", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddOutputDesc("y2", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddOutputDesc("y3", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  NodePtr node1 = graph_ptr->AddNode(in_op_ptr);
-  NodePtr node2 = graph_ptr->AddNode(in_op_ptr);
-  NodePtr node3 = graph_ptr->AddNode(in_op_ptr);
-
-  OutDataAnchorPtr out_data_anchor = node1->GetOutDataAnchor(1);
-  InDataAnchorPtr in_data_anchor = node2->GetInDataAnchor(1);
-  EXPECT_EQ(out_data_anchor != nullptr, true);
-  EXPECT_EQ(in_data_anchor != nullptr, true);
-  EXPECT_EQ(node1->GetOutDataAnchor(1)->LinkTo(node2->GetInDataAnchor(0)), GRAPH_SUCCESS);
-  EXPECT_EQ(node1->GetOutDataAnchor(1)->LinkTo(node2->GetInDataAnchor(1)), GRAPH_SUCCESS);
-  EXPECT_EQ(node1->GetOutDataAnchor(1)->LinkTo(node2->GetInDataAnchor(2)), GRAPH_SUCCESS);
-
-  size_t out_idx = 0;
-  for (; out_idx < out_data_anchor->peer_anchors_.size(); out_idx++) {
-    if (out_data_anchor->peer_anchors_[out_idx].lock() == in_data_anchor) {
-      break;
-    }
-  }
-  EXPECT_EQ(out_idx, 1);
-
-  size_t in_idx = 0;
-  for (; in_idx < in_data_anchor->peer_anchors_.size(); in_idx++) {
-    if (in_data_anchor->peer_anchors_[in_idx].lock() == out_data_anchor) {
-      break;
-    }
-  }
-  EXPECT_EQ(in_idx, 0);
-
-  out_data_anchor->ReplacePeer(in_data_anchor, node3->GetInDataAnchor(1), node3->GetOutDataAnchor(1));
-
-  size_t out_idx1 = 0;
-  for (; out_idx1 < out_data_anchor->peer_anchors_.size(); out_idx1++) {
-    if (out_data_anchor->peer_anchors_[out_idx1].lock() == node3->GetInDataAnchor(1)) {
-      break;
-    }
-  }
-  EXPECT_EQ(out_idx1, out_idx);
-
-  size_t in_idx1 = 0;
-  for (; in_idx1 < in_data_anchor->peer_anchors_.size(); in_idx1++) {
-    if (in_data_anchor->peer_anchors_[in_idx1].lock() == node3->GetOutDataAnchor(1)) {
-      break;
-    }
-  }
-  EXPECT_EQ(in_idx1, in_idx);
-}
-
-TEST_F(UtestGeAnchor, graph_utils_insert_node) {
-  ComputeGraphPtr graph_ptr = std::make_shared<ComputeGraph>("graph");
-  OpDescPtr in_op_ptr = std::make_shared<OpDesc>("in_op_1", "float");
-  in_op_ptr->AddInputDesc("x1", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddInputDesc("x2", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddInputDesc("x3", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddOutputDesc("y1", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddOutputDesc("y2", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  in_op_ptr->AddOutputDesc("y3", GeTensorDesc(GeShape({1, 32, 8, 8}), FORMAT_NCHW));
-  NodePtr node1 = graph_ptr->AddNode(in_op_ptr);
-  NodePtr node2 = graph_ptr->AddNode(in_op_ptr);
-  NodePtr node3 = graph_ptr->AddNode(in_op_ptr);
-
-  OutDataAnchorPtr out_data_anchor = node1->GetOutDataAnchor(1);
-  InDataAnchorPtr in_data_anchor = node2->GetInDataAnchor(1);
-  EXPECT_EQ(out_data_anchor != nullptr, true);
-  EXPECT_EQ(in_data_anchor != nullptr, true);
-  EXPECT_EQ(node1->GetOutDataAnchor(1)->LinkTo(node2->GetInDataAnchor(0)), GRAPH_SUCCESS);
-  EXPECT_EQ(node1->GetOutDataAnchor(1)->LinkTo(node2->GetInDataAnchor(1)), GRAPH_SUCCESS);
-  EXPECT_EQ(node1->GetOutDataAnchor(1)->LinkTo(node2->GetInDataAnchor(2)), GRAPH_SUCCESS);
-
-  size_t out_idx = 0;
-  for (; out_idx < out_data_anchor->peer_anchors_.size(); out_idx++) {
-    if (out_data_anchor->peer_anchors_[out_idx].lock() == in_data_anchor) {
-      break;
-    }
-  }
-  EXPECT_EQ(out_idx, 1);
-
-  size_t in_idx = 0;
-  for (; in_idx < in_data_anchor->peer_anchors_.size(); in_idx++) {
-    if (in_data_anchor->peer_anchors_[in_idx].lock() == out_data_anchor) {
-      break;
-    }
-  }
-  EXPECT_EQ(in_idx, 0);
-
-  GraphUtils::InsertNodeBetweenDataAnchors(out_data_anchor, in_data_anchor, node3);
-
-  size_t out_idx1 = 0;
-  for (; out_idx1 < out_data_anchor->peer_anchors_.size(); out_idx1++) {
-    if (out_data_anchor->peer_anchors_[out_idx1].lock() == node3->GetInDataAnchor(0)) {
-      break;
-    }
-  }
-  EXPECT_EQ(out_idx1, out_idx);
-
-  size_t in_idx1 = 0;
-  for (; in_idx1 < in_data_anchor->peer_anchors_.size(); in_idx1++) {
-    if (in_data_anchor->peer_anchors_[in_idx1].lock() == node3->GetOutDataAnchor(0)) {
-      break;
-    }
-  }
-  EXPECT_EQ(in_idx1, in_idx);
-}

tests/ut/common/graph/testcase/ge_graph/ge_model_serialize_unittest.cc

@@ -30,6 +30,7 @@
 #include "graph/model_serialize.h"
 
 #include "graph/detail/model_serialize_imp.h"
+#include "graph/node_impl.h"
 #include "graph/ge_attr_value.h"
 #include "graph/utils/graph_utils.h"
 #include "graph/utils/tensor_utils.h"
@@ -1062,7 +1063,7 @@ TEST(UtestGeModelSerialize, test_model_serialize_imp_invalid_param) {
 
   auto graph = std::make_shared<ComputeGraph>("test_graph");
   auto node = graph->AddNode(std::make_shared<OpDesc>());
-  node->op_ = nullptr;
+  node->impl_->op_ = nullptr;
   ge::proto::ModelDef model_def;
   Model model;
   model.SetGraph(GraphUtils::CreateGraphFromComputeGraph(graph));

tests/ut/common/graph/testcase/ge_graph/ge_tensor_unittest.cc

@@ -25,6 +25,7 @@
 #include "graph/ge_attr_value.h"
 #include "graph/tensor.h"
 #include "graph/utils/tensor_utils.h"
+#include "graph/ge_tensor_impl.h"
 #undef private
 #undef protected
 
@@ -196,23 +197,6 @@ TEST_F(UtestGeTensor, test_shape_copy_move) {
   EXPECT_EQ(shape4.GetDimNum(), 3);
 }
 
-TEST_F(UtestGeTensor, test_tensor_desc_invalid_null) {
-  GeTensorDesc tensor_desc(nullptr, nullptr);
-  EXPECT_EQ(tensor_desc.GetDataType(), DT_UNDEFINED);
-  EXPECT_EQ(tensor_desc.GetFormat(), FORMAT_RESERVED);
-  EXPECT_EQ(tensor_desc.MutableShape().shape_def_.GetProtoMsg(), nullptr);
-
-  GeTensorDesc tensor_desc2;
-  EXPECT_EQ(tensor_desc2.GetDataType(), DT_FLOAT);
-  EXPECT_EQ(tensor_desc2.GetFormat(), FORMAT_ND);
-
-  tensor_desc2.SetDataType(DT_DUAL_SUB_INT8);
-  EXPECT_EQ(tensor_desc2.GetDataType(), DT_DUAL_SUB_INT8);
-
-  TensorUtils::SetWeightSize(tensor_desc, 100);
-  EXPECT_EQ(TensorUtils::GetWeightSize(tensor_desc), 0);
-}
-
 TEST_F(UtestGeTensor, test_tensor_invalid_null) {
   ProtoMsgOwner msg_owner;
   GeTensor tensor(msg_owner, nullptr);