[moco-tf] Introduce TFSub IR (#6275)

This will introduce TFSub IR and required implementations

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 c275d67..0185a6f 100644 (file)
--- a/compiler/moco-tf/src/Dialect/TFNodes.h
+++ b/compiler/moco-tf/src/Dialect/TFNodes.h
@@ -33,5 +33,6 @@
 #include "IR/TFReshape.h"
 #include "IR/TFRsqrt.h"
 #include "IR/TFSqueeze.h"
+#include "IR/TFSub.h"
 
 #endif // __MOCO_TF_DIALECT_TFNODES_H__

diff --git a/compiler/moco-tf/src/Dialect/TFNodes.lst b/compiler/moco-tf/src/Dialect/TFNodes.lst
index dcd2122..41dce05 100644 (file)
--- a/compiler/moco-tf/src/Dialect/TFNodes.lst
+++ b/compiler/moco-tf/src/Dialect/TFNodes.lst
@@ -23,3 +23,4 @@ TENSORFLOW_NODE(Relu6, TFRelu6)
 TENSORFLOW_NODE(Reshape, TFReshape)
 TENSORFLOW_NODE(Rsqrt, TFRsqrt)
 TENSORFLOW_NODE(Squeeze, TFSqueeze)
+TENSORFLOW_NODE(Sub, TFSub)

diff --git a/compiler/moco-tf/src/IR/TFSub.h b/compiler/moco-tf/src/IR/TFSub.h
new file mode 100644 (file)
index 0000000..00ebf44
--- /dev/null
+++ b/compiler/moco-tf/src/IR/TFSub.h
@@ -0,0 +1,59 @@
+/*
+ * 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_TFSUB_H__
+#define __MOCO_TF_IR_TFSUB_H__
+
+#include "Dialect/TFNodeDecl.h"
+
+namespace moco
+{
+namespace tf
+{
+
+/// @note TFSub corresponds to the following GraphDef
+/*
+node {
+  name: "sub"
+  op: "Sub"
+  input: "x"
+  input: "y"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+}
+*/
+
+class TFSub final : public loco::FixedArityNode<2, TFNodeImpl<TFOpcode::Sub>>
+{
+public:
+  TFSub() = 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_TFSUB_H__

diff --git a/compiler/moco-tf/src/IR/TFSub.test.cpp b/compiler/moco-tf/src/IR/TFSub.test.cpp
new file mode 100644 (file)
index 0000000..79f7466
--- /dev/null
+++ b/compiler/moco-tf/src/IR/TFSub.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/TFSub.h"
+
+#include "Dialect/TFDialect.h"
+
+#include <gtest/gtest.h>
+
+TEST(TFSubTest, constructor)
+{
+  moco::tf::TFSub sub_node;
+
+  ASSERT_EQ(sub_node.dialect(), moco::tf::TFDialect::get());
+  ASSERT_EQ(sub_node.opcode(), moco::tf::TFOpcode::Sub);
+
+  ASSERT_EQ(sub_node.x(), nullptr);
+  ASSERT_EQ(sub_node.y(), nullptr);
+}

diff --git a/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp b/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp
index d6c576d..e098e7b 100644 (file)
--- a/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp
+++ b/compiler/moco-tf/src/Transforms/FixPaddingTransform.cpp
@@ -772,6 +772,12 @@ bool fix_padding(moco::tf::TFSqueeze *node)
   return false;
 }
 
+bool fix_padding(moco::tf::TFSub *node)
+{
+  // Nothing to do with padding
+  return false;
+}
+
 bool fix_padding(locoex::COpCall *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 8c1e661..4462fe4 100644 (file)
--- a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
+++ b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
@@ -1330,6 +1330,28 @@ bool fix_shape(moco::tf::TFSqueeze *node)
   return true;
 }
 
+bool fix_shape(moco::tf::TFSub *node)
+{
+  auto x = node->x();
+  auto y = node->y();
+  if (x == nullptr || y == nullptr)
+  {
+    // this node maybe disconnected by some transformation
+    // TODO remove this block after fixing to iterate only active nodes
+    return false;
+  }
+  auto x_shapedata = x->annot<ShapeInferenceData>();
+  auto y_shapedata = y->annot<ShapeInferenceData>();
+  if (x_shapedata == nullptr || y_shapedata == nullptr)
+  {
+    return false;
+  }
+  // TODO check shape difference
+
+  // Output shape is same as the input
+  return copy_shapedata(x, node);
+}
+
 bool fix_shape(locoex::COpCall *node)
 {
   // if node already has ShapeInferenceData, skip