From 7c796e273a1566bbdfed6bbd7eb388ce6b139b17 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: Wed, 14 Aug 2019 14:18:05 +0900 Subject: [PATCH] [moco-tf] Introduce TFSquaredDifference IR (#6580) This will introduce TFSquaredDifference IR and required minimum changes Signed-off-by: SaeHie Park --- compiler/moco-tf/src/Dialect/TFNodes.h | 1 + compiler/moco-tf/src/Dialect/TFNodes.lst | 1 + compiler/moco-tf/src/IR/TFSquaredDifference.h | 60 ++++++++++++++++++++++ .../moco-tf/src/IR/TFSquaredDifference.test.cpp | 32 ++++++++++++ .../moco-tf/src/Transforms/FixShapeTransform.cpp | 7 +++ 5 files changed, 101 insertions(+) create mode 100644 compiler/moco-tf/src/IR/TFSquaredDifference.h create mode 100644 compiler/moco-tf/src/IR/TFSquaredDifference.test.cpp diff --git a/compiler/moco-tf/src/Dialect/TFNodes.h b/compiler/moco-tf/src/Dialect/TFNodes.h index 17ec339..8c3df00 100644 --- a/compiler/moco-tf/src/Dialect/TFNodes.h +++ b/compiler/moco-tf/src/Dialect/TFNodes.h @@ -35,6 +35,7 @@ #include "IR/TFRsqrt.h" #include "IR/TFShape.h" #include "IR/TFSqrt.h" +#include "IR/TFSquaredDifference.h" #include "IR/TFSqueeze.h" #include "IR/TFSub.h" diff --git a/compiler/moco-tf/src/Dialect/TFNodes.lst b/compiler/moco-tf/src/Dialect/TFNodes.lst index 6590cde..e6eff8a 100644 --- a/compiler/moco-tf/src/Dialect/TFNodes.lst +++ b/compiler/moco-tf/src/Dialect/TFNodes.lst @@ -25,5 +25,6 @@ TENSORFLOW_NODE(Reshape, TFReshape) TENSORFLOW_NODE(Rsqrt, TFRsqrt) TENSORFLOW_NODE(Shape, TFShape) TENSORFLOW_NODE(Sqrt, TFSqrt) +TENSORFLOW_NODE(SquaredDifference, TFSquaredDifference) TENSORFLOW_NODE(Squeeze, TFSqueeze) TENSORFLOW_NODE(Sub, TFSub) diff --git a/compiler/moco-tf/src/IR/TFSquaredDifference.h b/compiler/moco-tf/src/IR/TFSquaredDifference.h new file mode 100644 index 0000000..b0d8051 --- /dev/null +++ b/compiler/moco-tf/src/IR/TFSquaredDifference.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __MOCO_TF_IR_TFSQUAREDDIFFERENCE_H__ +#define __MOCO_TF_IR_TFSQUAREDDIFFERENCE_H__ + +#include "Dialect/TFNodeDecl.h" + +namespace moco +{ +namespace tf +{ + +/// @note TFSquaredDifference corresponds to the following GraphDef +/* +node { + name: "SquaredDifference" + op: "SquaredDifference" + input: "input_x" + input: "input_y" + attr { + key: "T" + value { + type: DT_FLOAT + } + } +} +*/ + +class TFSquaredDifference final + : public loco::FixedArityNode<2, TFNodeImpl> +{ +public: + TFSquaredDifference() = default; + +public: + Node *x(void) const { return at(0)->node(); } + void x(Node *node) { at(0)->node(node); } + + Node *y(void) const { return at(1)->node(); } + void y(Node *node) { at(1)->node(node); } +}; + +} // namespace tf +} // namespace moco + +#endif // __MOCO_TF_IR_TFSQUAREDDIFFERENCE_H__ diff --git a/compiler/moco-tf/src/IR/TFSquaredDifference.test.cpp b/compiler/moco-tf/src/IR/TFSquaredDifference.test.cpp new file mode 100644 index 0000000..f83d28c --- /dev/null +++ b/compiler/moco-tf/src/IR/TFSquaredDifference.test.cpp @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "IR/TFSquaredDifference.h" + +#include "Dialect/TFDialect.h" + +#include + +TEST(TFSquaredDifferenceTest, constructor) +{ + moco::tf::TFSquaredDifference sd_node; + + ASSERT_EQ(sd_node.dialect(), moco::tf::TFDialect::get()); + ASSERT_EQ(sd_node.opcode(), moco::tf::TFOpcode::SquaredDifference); + + ASSERT_EQ(sd_node.x(), nullptr); + ASSERT_EQ(sd_node.y(), nullptr); +} diff --git a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp index 9f0f135..36f1cef 100644 --- a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp +++ b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp @@ -1332,6 +1332,13 @@ bool fix_shape(moco::tf::TFSqrt *node) return copy_shapedata(x, node); } +bool fix_shape(moco::tf::TFSquaredDifference *node) +{ + // Output shape is same as the input x + auto x = node->x(); + return copy_shapedata(x, node); +} + bool fix_shape(moco::tf::TFSqueeze *node) { auto shapedata = node->annot(); -- 2.7.4