[loco] Use link helper (#6271)
author박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Tue, 6 Aug 2019 09:37:51 +0000 (18:37 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Tue, 6 Aug 2019 09:37:51 +0000 (18:37 +0900)
Let's use link helper instead of deprecated node method.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
compiler/loco/src/IR/Graph.test.cpp
compiler/loco/src/Service/GraphTestcase.h
compiler/loco/src/Service/TypeInference.test.cpp
compiler/loco/src/loco.test.cpp
compiler/loco/src/tensorflow.test.cpp

index acef83f..90f9e9e 100644 (file)
@@ -147,8 +147,8 @@ TEST(GraphTest, getters_over_const_instance)
   auto pull = g->nodes()->create<loco::Pull>();
   auto push = g->nodes()->create<loco::Push>();
 
-  g->inputs()->create()->node(pull);
-  g->outputs()->create()->node(push);
+  loco::link(g->inputs()->create(), pull);
+  loco::link(g->outputs()->create(), push);
 
   auto ptr = const_cast<const loco::Graph *>(g.get());
 
@@ -189,11 +189,11 @@ TEST(GraphTest, graph_inout_enumeration)
   auto push_2 = g->nodes()->create<loco::Push>();
   auto push_3 = g->nodes()->create<loco::Push>();
 
-  g->inputs()->create()->node(pull_2);
-  g->inputs()->create()->node(pull_1);
+  loco::link(g->inputs()->create(), pull_2);
+  loco::link(g->inputs()->create(), pull_1);
 
-  g->outputs()->create()->node(push_1);
-  g->outputs()->create()->node(push_3);
+  loco::link(g->outputs()->create(), push_1);
+  loco::link(g->outputs()->create(), push_3);
 
   auto output_nodes = loco::output_nodes(g.get());
 
index 4e28539..0145b7f 100644 (file)
@@ -34,14 +34,14 @@ public:
     auto graph_input = _graph->inputs()->create();
 
     graph_input->name("input");
-    graph_input->node(pull_node);
+    loco::link(graph_input, pull_node);
     pull_node->index(0);
 
     // Create Graph Output
     auto graph_output = _graph->outputs()->create();
 
     graph_output->name("output");
-    graph_output->node(push_node);
+    loco::link(graph_output, push_node);
     push_node->index(0);
   }
 
@@ -76,14 +76,14 @@ public:
     auto graph_input = _graph->inputs()->create();
 
     graph_input->name("input");
-    graph_input->node(pull_node);
+    loco::link(graph_input, pull_node);
     pull_node->index(0);
 
     // Create Graph Output
     auto graph_output = _graph->outputs()->create();
 
     graph_output->name("output");
-    graph_output->node(push_node);
+    loco::link(graph_output, push_node);
     push_node->index(0);
   }
 
@@ -133,14 +133,14 @@ public:
     auto graph_input = _graph->inputs()->create();
 
     graph_input->name("input");
-    graph_input->node(pull_node);
+    loco::link(graph_input, pull_node);
     pull_node->index(0);
 
     // Create Graph Output
     auto graph_output = _graph->outputs()->create();
 
     graph_output->name("output");
-    graph_output->node(push_node);
+    loco::link(graph_output, push_node);
     push_node->index(0);
   }
 
index 9c65946..d725306 100644 (file)
@@ -35,12 +35,12 @@ TEST(TypeInferenceTest, framework)
   auto graph_input = g->inputs()->create();
 
   graph_input->name("input");
-  graph_input->node(pull_node);
+  loco::link(graph_input, pull_node);
 
   auto graph_output = g->outputs()->create();
 
   graph_output->name("output");
-  graph_output->node(push_node);
+  loco::link(graph_output, push_node);
 
   // Mock-up Type Inference Rule
   struct SampleTypeInferenceRule final : public loco::TypeInferenceRule
@@ -110,12 +110,12 @@ TEST(CanonicalTypeInferenceRuleTest, minimal)
   auto graph_input = g->inputs()->create();
 
   graph_input->name("input");
-  graph_input->node(pull_node);
+  loco::link(graph_input, pull_node);
 
   auto graph_output = g->outputs()->create();
 
   graph_output->name("output");
-  graph_output->node(push_node);
+  loco::link(graph_output, push_node);
 
   // Run Type Inference
   loco::CanonicalTypeInferenceRule rule;
@@ -147,12 +147,12 @@ TEST(CanonicalTypeInferenceRuleTest, relu6)
   auto graph_input = g->inputs()->create();
 
   graph_input->name("input");
-  graph_input->node(pull_node);
+  loco::link(graph_input, pull_node);
 
   auto graph_output = g->outputs()->create();
 
   graph_output->name("output");
-  graph_output->node(push_node);
+  loco::link(graph_output, push_node);
 
   // Run Type Inference
   loco::CanonicalTypeInferenceRule rule;
index 42f4f08..7496a18 100644 (file)
@@ -57,13 +57,13 @@ TEST(LOCO, identity_network)
   auto graph_input = g->inputs()->create();
 
   graph_input->name("input");
-  graph_input->node(pull_node);
+  loco::link(graph_input, pull_node);
   graph_input->dtype(loco::DataType::FLOAT32);
 
   auto graph_output = g->outputs()->create();
 
   graph_output->name("output");
-  graph_output->node(push_node);
+  loco::link(graph_output, push_node);
 
   // Set Input Index
   pull_node->index(0);
index c756efd..f534aee 100644 (file)
@@ -200,10 +200,10 @@ TEST(TensorFlowTest, MaxPool_Float_000)
   // Mark network-level input/output
   //
   auto input_0 = g->inputs()->create();
-  input_0->node(value);
+  loco::link(input_0, value);
 
   auto output_0 = g->outputs()->create();
-  output_0->node(push);
+  loco::link(output_0, push);
 
   // NOTE This example SHOULD BE valid.
   ASSERT_TRUE(loco::valid(g.get()));
@@ -376,10 +376,10 @@ TEST(TensorFlowTest, Conv2D_Float_000)
   // Mark network-level input/output
   //
   auto input_0 = g->inputs()->create();
-  input_0->node(inp);
+  loco::link(input_0, inp);
 
   auto output_0 = g->outputs()->create();
-  output_0->node(push);
+  loco::link(output_0, push);
 
   // NOTE This example SHOULD BE valid.
   ASSERT_TRUE(loco::valid(g.get()));