From d833aadc652f9303730b24cc81c4335ea6435fc7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/On-Device=20Lab=28SR=29/Princip?= =?utf8?q?al=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 8 Oct 2019 17:59:14 +0900 Subject: [PATCH] [moco] Revise AvgPool Conv2D input names (#7989) This will fix AvgPool and Conv2D input name to follow that from TensorFlow REGISTER_OP input names Signed-off-by: SaeHie Park --- compiler/moco/lang/include/moco/IR/Nodes/TFAvgPool.h | 4 ++-- compiler/moco/lang/include/moco/IR/Nodes/TFConv2D.h | 4 ++-- compiler/moco/lang/src/IR/Nodes/TFAvgPool.test.cpp | 2 +- compiler/moco/lang/src/IR/Nodes/TFConv2D.test.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/moco/lang/include/moco/IR/Nodes/TFAvgPool.h b/compiler/moco/lang/include/moco/IR/Nodes/TFAvgPool.h index 65486a6..74c91b5 100644 --- a/compiler/moco/lang/include/moco/IR/Nodes/TFAvgPool.h +++ b/compiler/moco/lang/include/moco/IR/Nodes/TFAvgPool.h @@ -73,8 +73,8 @@ public: TFAvgPool() = default; public: - Node *input(void) const { return at(0)->node(); } - void input(Node *node) { return at(0)->node(node); } + Node *value(void) const { return at(0)->node(); } + void value(Node *node) { return at(0)->node(node); } public: const TFDataLayout &data_layout(void) const { return _data_layout; } diff --git a/compiler/moco/lang/include/moco/IR/Nodes/TFConv2D.h b/compiler/moco/lang/include/moco/IR/Nodes/TFConv2D.h index 8d7bd71..0d5a178 100644 --- a/compiler/moco/lang/include/moco/IR/Nodes/TFConv2D.h +++ b/compiler/moco/lang/include/moco/IR/Nodes/TFConv2D.h @@ -30,8 +30,8 @@ public: loco::Node *input(void) const { return at(0)->node(); } void input(Node *node) { at(0)->node(node); } - loco::Node *filters(void) const { return at(1)->node(); } - void filters(Node *node) { at(1)->node(node); } + loco::Node *filter(void) const { return at(1)->node(); } + void filter(Node *node) { at(1)->node(node); } public: const TFPadding &padding(void) const { return _padding; } diff --git a/compiler/moco/lang/src/IR/Nodes/TFAvgPool.test.cpp b/compiler/moco/lang/src/IR/Nodes/TFAvgPool.test.cpp index 3059855..32a27ff 100644 --- a/compiler/moco/lang/src/IR/Nodes/TFAvgPool.test.cpp +++ b/compiler/moco/lang/src/IR/Nodes/TFAvgPool.test.cpp @@ -26,7 +26,7 @@ TEST(TFAvgPoolTest, constructor) ASSERT_EQ(avgpool.dialect(), moco::TFDialect::get()); ASSERT_EQ(avgpool.opcode(), moco::TFOpcode::AvgPool); - ASSERT_EQ(avgpool.input(), nullptr); + ASSERT_EQ(avgpool.value(), nullptr); ASSERT_EQ(avgpool.data_layout(), ""); ASSERT_EQ(avgpool.padding(), ""); ASSERT_EQ(avgpool.ksize(), std::vector({})); diff --git a/compiler/moco/lang/src/IR/Nodes/TFConv2D.test.cpp b/compiler/moco/lang/src/IR/Nodes/TFConv2D.test.cpp index 28a8133..3e3453d 100644 --- a/compiler/moco/lang/src/IR/Nodes/TFConv2D.test.cpp +++ b/compiler/moco/lang/src/IR/Nodes/TFConv2D.test.cpp @@ -27,7 +27,7 @@ TEST(TFConv2DTest, constructor) ASSERT_EQ(conv2d_node.opcode(), moco::TFOpcode::Conv2D); ASSERT_EQ(conv2d_node.input(), nullptr); - ASSERT_EQ(conv2d_node.filters(), nullptr); + ASSERT_EQ(conv2d_node.filter(), nullptr); ASSERT_EQ(conv2d_node.padding(), ""); ASSERT_EQ(conv2d_node.data_layout(), ""); ASSERT_EQ(conv2d_node.strides().size(), 0); -- 2.7.4