From: 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 Date: Tue, 13 Aug 2019 22:23:49 +0000 (+0900) Subject: [moco-tf] Introduce TFSqrt IR (#6553) X-Git-Tag: accepted/tizen/unified/20190903.052428~419 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4912cd7a829613889f544c7a2c94e8c0ce35bc5;p=platform%2Fcore%2Fml%2Fnnfw.git [moco-tf] Introduce TFSqrt IR (#6553) This will introduce TFSqrt IR to represent TensorFlow Sqrt node and required minimum implementation Signed-off-by: SaeHie Park --- diff --git a/compiler/moco-tf/src/Dialect/TFNodes.h b/compiler/moco-tf/src/Dialect/TFNodes.h index 5bbc431..17ec339 100644 --- a/compiler/moco-tf/src/Dialect/TFNodes.h +++ b/compiler/moco-tf/src/Dialect/TFNodes.h @@ -34,6 +34,7 @@ #include "IR/TFReshape.h" #include "IR/TFRsqrt.h" #include "IR/TFShape.h" +#include "IR/TFSqrt.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 b9bc814..6590cde 100644 --- a/compiler/moco-tf/src/Dialect/TFNodes.lst +++ b/compiler/moco-tf/src/Dialect/TFNodes.lst @@ -24,5 +24,6 @@ TENSORFLOW_NODE(Relu6, TFRelu6) TENSORFLOW_NODE(Reshape, TFReshape) TENSORFLOW_NODE(Rsqrt, TFRsqrt) TENSORFLOW_NODE(Shape, TFShape) +TENSORFLOW_NODE(Sqrt, TFSqrt) TENSORFLOW_NODE(Squeeze, TFSqueeze) TENSORFLOW_NODE(Sub, TFSub) diff --git a/compiler/moco-tf/src/IR/TFSqrt.h b/compiler/moco-tf/src/IR/TFSqrt.h new file mode 100644 index 0000000..a95ff16 --- /dev/null +++ b/compiler/moco-tf/src/IR/TFSqrt.h @@ -0,0 +1,55 @@ +/* + * 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_TFSQRT_H__ +#define __MOCO_TF_IR_TFSQRT_H__ + +#include "Dialect/TFNodeDecl.h" + +namespace moco +{ +namespace tf +{ + +/// @note TFSqrt corresponds to the following GraphDef +/* +node { + name: "Sqrt" + op: "Sqrt" + input: "Placeholder" + attr { + key: "T" + value { + type: DT_FLOAT + } + } +} +*/ + +class TFSqrt final : public loco::FixedArityNode<1, TFNodeImpl> +{ +public: + TFSqrt() = default; + +public: + Node *x(void) const { return at(0)->node(); } + void x(Node *node) { at(0)->node(node); } +}; + +} // namespace tf +} // namespace moco + +#endif // __MOCO_TF_IR_TFSQRT_H__ diff --git a/compiler/moco-tf/src/IR/TFSqrt.test.cpp b/compiler/moco-tf/src/IR/TFSqrt.test.cpp new file mode 100644 index 0000000..9048d57 --- /dev/null +++ b/compiler/moco-tf/src/IR/TFSqrt.test.cpp @@ -0,0 +1,31 @@ +/* + * 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/TFSqrt.h" + +#include "Dialect/TFDialect.h" + +#include + +TEST(TFSqrtTest, constructor) +{ + moco::tf::TFSqrt sqrt_node; + + ASSERT_EQ(sqrt_node.dialect(), moco::tf::TFDialect::get()); + ASSERT_EQ(sqrt_node.opcode(), moco::tf::TFOpcode::Sqrt); + + ASSERT_EQ(sqrt_node.x(), nullptr); +} diff --git a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp index fc89e3d..9f0f135 100644 --- a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp +++ b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp @@ -1325,6 +1325,13 @@ bool fix_shape(moco::tf::TFShape *node) return true; } +bool fix_shape(moco::tf::TFSqrt *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();