[moco-tf] Introduce TFDialect for Softmax (#6568)

* [moco-tf] Introduce TFDialect for Softmax

This commit will introduce `TFSoftmax`

Signed-off-by: Seok NamKoong <sk.namkoong@samsung.com>
* add fix transforms

* remove fix_pad

* use logits instead of input

diff --git a/compiler/moco-tf/src/Dialect/TFNodes.h b/compiler/moco-tf/src/Dialect/TFNodes.h
index 8c3df00..ed6d5ca 100644 (file)
--- 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/TFSoftmax.h"
 #include "IR/TFSqrt.h"
 #include "IR/TFSquaredDifference.h"
 #include "IR/TFSqueeze.h"

diff --git a/compiler/moco-tf/src/Dialect/TFNodes.lst b/compiler/moco-tf/src/Dialect/TFNodes.lst
index e6eff8a..9e66014 100644 (file)
--- a/compiler/moco-tf/src/Dialect/TFNodes.lst
+++ b/compiler/moco-tf/src/Dialect/TFNodes.lst
@@ -24,6 +24,7 @@ TENSORFLOW_NODE(Relu6, TFRelu6)
 TENSORFLOW_NODE(Reshape, TFReshape)
 TENSORFLOW_NODE(Rsqrt, TFRsqrt)
 TENSORFLOW_NODE(Shape, TFShape)
+TENSORFLOW_NODE(Softmax, TFSoftmax)
 TENSORFLOW_NODE(Sqrt, TFSqrt)
 TENSORFLOW_NODE(SquaredDifference, TFSquaredDifference)
 TENSORFLOW_NODE(Squeeze, TFSqueeze)

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

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

diff --git a/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp b/compiler/moco-tf/src/Transforms/FixShapeTransform.cpp
index 36f1cef..59314e1 100644 (file)
--- 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::TFSoftmax *node)
+{
+  // Output shape is same as the input x
+  auto logits = node->logits();
+  return copy_shapedata(logits, node);
+}
+
 bool fix_shape(moco::tf::TFSquaredDifference *node)
 {
   // Output shape is same as the input x