From bf2680218dad9d16a819e7c67a22d30764395e1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B1=84=EC=84=B1=EC=9A=B0/On-Device=20Lab=28SR=29/Enginee?= =?utf8?q?r/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 11 Sep 2019 17:04:55 +0900 Subject: [PATCH] [loco] Rename existing Pad class (#7393) This commit is for renaming existing Pad class in loco. Related: #7357 Signed-off-by: seongwoo --- compiler/loco/include/loco/IR/Nodes.h | 30 +++++++++++----------- compiler/loco/src/IR/Pad.test.cpp | 2 +- .../src/Service/CanonicalShapeInferenceRule.cpp | 4 +-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/loco/include/loco/IR/Nodes.h b/compiler/loco/include/loco/IR/Nodes.h index e53991c..d8a580a 100644 --- a/compiler/loco/include/loco/IR/Nodes.h +++ b/compiler/loco/include/loco/IR/Nodes.h @@ -305,8 +305,8 @@ public: void ifm(Node *node) { at(0)->node(node); } public: - const Pad<2> *pad(void) const { return &_pad; } - Pad<2> *pad(void) { return &_pad; } + const Padding2D *pad(void) const { return &_pad; } + Padding2D *pad(void) { return &_pad; } public: const Window<2> *window(void) const { return &_window; } @@ -318,7 +318,7 @@ public: private: // Pad - Pad<2> _pad; + Padding2D _pad; // Window Window<2> _window; // Stride @@ -351,8 +351,8 @@ public: void convention(const Convention &convention) { _convention = convention; } public: - const Pad<2> *pad(void) const { return &_pad; } - Pad<2> *pad(void) { return &_pad; } + const Padding2D *pad(void) const { return &_pad; } + Padding2D *pad(void) { return &_pad; } public: const Window<2> *window(void) const { return &_window; } @@ -364,7 +364,7 @@ public: private: Convention _convention = Convention::Unknown; - Pad<2> _pad; + Padding2D _pad; Window<2> _window; Stride<2> _stride; }; @@ -523,15 +523,15 @@ public: void ker(Node *node) { at(1)->node(node); } public: - const Pad<2> *pad(void) const { return &_pad; } - Pad<2> *pad(void) { return &_pad; } + const Padding2D *pad(void) const { return &_pad; } + Padding2D *pad(void) { return &_pad; } public: const Stride<2> *stride(void) const { return &_stride; } Stride<2> *stride(void) { return &_stride; } private: - Pad<2> _pad; + Padding2D _pad; Stride<2> _stride; // TODO Support "Dilation" @@ -551,15 +551,15 @@ public: void ker(Node *node) { at(1)->node(node); } public: - const Pad<2> *pad(void) const { return &_pad; } - Pad<2> *pad(void) { return &_pad; } + const Padding2D *pad(void) const { return &_pad; } + Padding2D *pad(void) { return &_pad; } public: const Stride<2> *stride(void) const { return &_stride; } Stride<2> *stride(void) { return &_stride; } private: - Pad<2> _pad; + Padding2D _pad; Stride<2> _stride; // TODO Support "Dilation" @@ -624,15 +624,15 @@ public: void ker(Node *node) { at(1)->node(node); } public: - const Pad<2> *pad(void) const { return &_pad; } - Pad<2> *pad(void) { return &_pad; } + const Padding2D *pad(void) const { return &_pad; } + Padding2D *pad(void) { return &_pad; } public: const Stride<2> *stride(void) const { return &_stride; } Stride<2> *stride(void) { return &_stride; } private: - Pad<2> _pad; + Padding2D _pad; Stride<2> _stride; // TODO Support "Dilation" diff --git a/compiler/loco/src/IR/Pad.test.cpp b/compiler/loco/src/IR/Pad.test.cpp index e0b288a..6ce64ed 100644 --- a/compiler/loco/src/IR/Pad.test.cpp +++ b/compiler/loco/src/IR/Pad.test.cpp @@ -20,7 +20,7 @@ TEST(PadTest, default_constructor_2D) { - loco::Pad<2> pad; + loco::Padding2D pad; ASSERT_EQ(pad.top(), 0); ASSERT_EQ(pad.bottom(), 0); diff --git a/compiler/loco/src/Service/CanonicalShapeInferenceRule.cpp b/compiler/loco/src/Service/CanonicalShapeInferenceRule.cpp index 9580890..5ff2bc4 100644 --- a/compiler/loco/src/Service/CanonicalShapeInferenceRule.cpp +++ b/compiler/loco/src/Service/CanonicalShapeInferenceRule.cpp @@ -133,12 +133,12 @@ public: } public: - void pad(const loco::Pad<2> *value) { _pad = value; } + void pad(const loco::Padding2D *value) { _pad = value; } void window(const loco::Window<2> *value) { _window = value; } void stride(const loco::Stride<2> *value) { _stride = value; } public: - const loco::Pad<2> *_pad = nullptr; + const loco::Padding2D *_pad = nullptr; const loco::Window<2> *_window = nullptr; const loco::Stride<2> *_stride = nullptr; }; -- 2.7.4