[moco-tf] Introduce TFRelu and TFRelu6 IR (#6143)

This will introduce TensorFlow dialect TFRelu and TFRelu6 IR and minimum required codes

Signed-off-by: SaeHie Park <saehie.park@samsung.com>

diff --git a/compiler/moco-tf/src/Dialect/TFNodes.h b/compiler/moco-tf/src/Dialect/TFNodes.h
index 39b8743..973e649 100644 (file)
--- a/compiler/moco-tf/src/Dialect/TFNodes.h
+++ b/compiler/moco-tf/src/Dialect/TFNodes.h
@@ -27,6 +27,8 @@
 #include "IR/TFIdentity.h"
 #include "IR/TFMaxPool.h"
 #include "IR/TFMul.h"
+#include "IR/TFRelu.h"
+#include "IR/TFRelu6.h"
 #include "IR/TFReshape.h"
 #include "IR/TFRsqrt.h"
 #include "IR/TFSqueeze.h"

diff --git a/compiler/moco-tf/src/Dialect/TFNodes.lst b/compiler/moco-tf/src/Dialect/TFNodes.lst
index 96d0346..2438682 100644 (file)
--- a/compiler/moco-tf/src/Dialect/TFNodes.lst
+++ b/compiler/moco-tf/src/Dialect/TFNodes.lst
@@ -17,6 +17,8 @@ TENSORFLOW_NODE(FusedBatchNorm, TFFusedBatchNorm)
 TENSORFLOW_NODE(Identity, TFIdentity)
 TENSORFLOW_NODE(MaxPool, TFMaxPool)
 TENSORFLOW_NODE(Mul, TFMul)
+TENSORFLOW_NODE(Relu, TFRelu)
+TENSORFLOW_NODE(Relu6, TFRelu6)
 TENSORFLOW_NODE(Reshape, TFReshape)
 TENSORFLOW_NODE(Rsqrt, TFRsqrt)
 TENSORFLOW_NODE(Squeeze, TFSqueeze)

diff --git a/compiler/moco-tf/src/IR/TFRelu.h b/compiler/moco-tf/src/IR/TFRelu.h
new file mode 100644 (file)
index 0000000..cbcc227
--- /dev/null
+++ b/compiler/moco-tf/src/IR/TFRelu.h
@@ -0,0 +1,40 @@
+/*
+ * 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_TFRELU_H__
+#define __MOCO_TF_IR_TFRELU_H__
+
+#include "Dialect/TFNodeDecl.h"
+
+namespace moco
+{
+namespace tf
+{
+
+class TFRelu final : public loco::FixedArityNode<1, TFNodeImpl<TFOpcode::Relu>>
+{
+public:
+  TFRelu() = default;
+
+public:
+  Node *features(void) const { return at(0)->node(); }
+  void features(Node *node) { at(0)->node(node); }
+};
+
+} // namespace tf
+} // namespace moco
+
+#endif // __MOCO_TF_IR_TFRELU_H__

diff --git a/compiler/moco-tf/src/IR/TFRelu.test.cpp b/compiler/moco-tf/src/IR/TFRelu.test.cpp
new file mode 100644 (file)
index 0000000..7762079
--- /dev/null
+++ b/compiler/moco-tf/src/IR/TFRelu.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/TFRelu.h"
+
+#include "Dialect/TFDialect.h"
+
+#include <gtest/gtest.h>
+
+TEST(TFReluTest, constructor)
+{
+  moco::tf::TFRelu relu_node;
+
+  ASSERT_EQ(relu_node.dialect(), moco::tf::TFDialect::get());
+  ASSERT_EQ(relu_node.opcode(), moco::tf::TFOpcode::Relu);
+
+  ASSERT_EQ(relu_node.features(), nullptr);
+}

diff --git a/compiler/moco-tf/src/IR/TFRelu6.h b/compiler/moco-tf/src/IR/TFRelu6.h
new file mode 100644 (file)
index 0000000..360c2de
--- /dev/null
+++ b/compiler/moco-tf/src/IR/TFRelu6.h
@@ -0,0 +1,40 @@
+/*
+ * 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_TFRELU6_H__
+#define __MOCO_TF_IR_TFRELU6_H__
+
+#include "Dialect/TFNodeDecl.h"
+
+namespace moco
+{
+namespace tf
+{
+
+class TFRelu6 final : public loco::FixedArityNode<1, TFNodeImpl<TFOpcode::Relu6>>
+{
+public:
+  TFRelu6() = default;
+
+public:
+  Node *features(void) const { return at(0)->node(); }
+  void features(Node *node) { at(0)->node(node); }
+};
+
+} // namespace tf
+} // namespace moco
+
+#endif // __MOCO_TF_IR_TFRELU6_H__

diff --git a/compiler/moco-tf/src/IR/TFRelu6.test.cpp b/compiler/moco-tf/src/IR/TFRelu6.test.cpp
new file mode 100644 (file)
index 0000000..d342ccd
--- /dev/null
+++ b/compiler/moco-tf/src/IR/TFRelu6.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/TFRelu6.h"
+
+#include "Dialect/TFDialect.h"
+
+#include <gtest/gtest.h>
+
+TEST(TFRelu6Test, constructor)
+{
+  moco::tf::TFRelu6 relu6_node;
+
+  ASSERT_EQ(relu6_node.dialect(), moco::tf::TFDialect::get());
+  ASSERT_EQ(relu6_node.opcode(), moco::tf::TFOpcode::Relu6);
+
+  ASSERT_EQ(relu6_node.features(), nullptr);
+}

diff --git a/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp b/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp
index 5d90401..5bcf784 100644 (file)
--- a/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp
+++ b/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp
@@ -735,6 +735,18 @@ bool fix_padding(moco::tf::TFMul *node)
   return false;
 }
 
+bool fix_padding(moco::tf::TFRelu *node)
+{
+  // Nothing to do with padding
+  return false;
+}
+
+bool fix_padding(moco::tf::TFRelu6 *node)
+{
+  // Nothing to do with padding
+  return false;
+}
+
 bool fix_padding(moco::tf::TFReshape *node)
 {
   // Nothing to do with padding

diff --git a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
index 90c2c5d..11e330d 100644 (file)
--- a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
+++ b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
@@ -1064,6 +1064,20 @@ bool fix_shape(moco::tf::TFMul *node)
   return copy_shapedata(x, node);
 }
 
+bool fix_shape(moco::tf::TFRelu *node)
+{
+  // Output shape is same as the input
+  auto features = node->features();
+  return copy_shapedata(features, node);
+}
+
+bool fix_shape(moco::tf::TFRelu6 *node)
+{
+  // Output shape is same as the input
+  auto features = node->features();
+  return copy_shapedata(features, node);
+}
+
 bool fix_shape(moco::tf::TFReshape *node)
 {
   auto shapedata = node->annot<ShapeInferenceData>();