From 979edcf1981752906f947bb641c6a7ba5dc577eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 6 Aug 2019 18:37:51 +0900 Subject: [PATCH] [loco] Use link helper (#6271) Let's use link helper instead of deprecated node method. Signed-off-by: Jonghyun Park --- compiler/loco/src/IR/Graph.test.cpp | 12 ++++++------ compiler/loco/src/Service/GraphTestcase.h | 12 ++++++------ compiler/loco/src/Service/TypeInference.test.cpp | 12 ++++++------ compiler/loco/src/loco.test.cpp | 4 ++-- compiler/loco/src/tensorflow.test.cpp | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/compiler/loco/src/IR/Graph.test.cpp b/compiler/loco/src/IR/Graph.test.cpp index acef83f..90f9e9e 100644 --- a/compiler/loco/src/IR/Graph.test.cpp +++ b/compiler/loco/src/IR/Graph.test.cpp @@ -147,8 +147,8 @@ TEST(GraphTest, getters_over_const_instance) auto pull = g->nodes()->create(); auto push = g->nodes()->create(); - 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(g.get()); @@ -189,11 +189,11 @@ TEST(GraphTest, graph_inout_enumeration) auto push_2 = g->nodes()->create(); auto push_3 = g->nodes()->create(); - 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()); diff --git a/compiler/loco/src/Service/GraphTestcase.h b/compiler/loco/src/Service/GraphTestcase.h index 4e28539..0145b7f 100644 --- a/compiler/loco/src/Service/GraphTestcase.h +++ b/compiler/loco/src/Service/GraphTestcase.h @@ -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); } diff --git a/compiler/loco/src/Service/TypeInference.test.cpp b/compiler/loco/src/Service/TypeInference.test.cpp index 9c65946..d725306 100644 --- a/compiler/loco/src/Service/TypeInference.test.cpp +++ b/compiler/loco/src/Service/TypeInference.test.cpp @@ -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; diff --git a/compiler/loco/src/loco.test.cpp b/compiler/loco/src/loco.test.cpp index 42f4f08..7496a18 100644 --- a/compiler/loco/src/loco.test.cpp +++ b/compiler/loco/src/loco.test.cpp @@ -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); diff --git a/compiler/loco/src/tensorflow.test.cpp b/compiler/loco/src/tensorflow.test.cpp index c756efd..f534aee 100644 --- a/compiler/loco/src/tensorflow.test.cpp +++ b/compiler/loco/src/tensorflow.test.cpp @@ -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())); -- 2.7.4