[moco-tf] Import Add node (#6083)

* [moco-tf] Import Add node

This will enable import TensorFlow Add node as TF dialect TFAdd node

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

diff --git a/compiler/moco-tf/src/Op/Add.cpp b/compiler/moco-tf/src/Op/Add.cpp
new file mode 100644 (file)
index 0000000..f5a1a79
--- /dev/null
+++ b/compiler/moco-tf/src/Op/Add.cpp
@@ -0,0 +1,100 @@
+/*
+ * 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/TFAdd.h"
+
+#include "GraphBuilder.h"
+#include "GraphBuilderContext.h"
+
+#include <loco.h>
+#include <stdex/Memory.h>
+
+#include <tensorflow/core/framework/graph.pb.h>
+
+namespace moco
+{
+namespace tf
+{
+
+/**
+ * @brief GraphBuilder for Add node
+ */
+class AddGraphBuilder final : public GraphBuilder
+{
+public:
+  bool validate(const tensorflow::NodeDef &) const override;
+  void build(const tensorflow::NodeDef &, GraphBuilderContext *) const override;
+};
+
+/**
+ * @brief GraphUpdate for TF Add node
+ */
+class TFAddGraphUpdate final : public GraphUpdate
+{
+public:
+  TFAddGraphUpdate(TFAdd *node, std::vector<TensorName> names) : _node(node), _names(names) {}
+
+  void input(const SymbolTable *) const override;
+
+private:
+  TFAdd *_node;
+  std::vector<TensorName> _names;
+};
+
+bool AddGraphBuilder::validate(const tensorflow::NodeDef &node) const
+{
+  assert(node.input_size() == 2);
+
+  return true;
+}
+
+void AddGraphBuilder::build(const tensorflow::NodeDef &node, GraphBuilderContext *context) const
+{
+  assert(context != nullptr);
+
+  loco::Graph *graph = context->graph();
+  SymbolTable *tensor_names = context->tensor_names();
+  UpdateQueue *updates = context->updates();
+
+  // creating TF dialect Add node
+  auto tf_add = graph->nodes()->create<TFAdd>();
+
+  TensorName output_name(node.name(), 0);
+  tensor_names->enroll(output_name, tf_add);
+
+  std::vector<TensorName> add_input_names;
+  add_input_names.push_back(TensorName(node.input(0))); // x
+  add_input_names.push_back(TensorName(node.input(1))); // y
+
+  auto tf_add_update = stdex::make_unique<TFAddGraphUpdate>(tf_add, add_input_names);
+  updates->enroll(std::move(tf_add_update));
+}
+
+void TFAddGraphUpdate::input(const SymbolTable *tensor_names) const
+{
+  int num_inputs = _names.size();
+  assert(num_inputs == 2);
+
+  _node->x(tensor_names->node(_names[0]));
+  _node->y(tensor_names->node(_names[1]));
+}
+
+} // namespace tf
+} // namespace moco
+
+#include "GraphBuilderRegistry.h"
+
+REGISTER_OP_BUILDER(Add, AddGraphBuilder)

diff --git a/compiler/moco-tf/src/Op/Add.test.cpp b/compiler/moco-tf/src/Op/Add.test.cpp
new file mode 100644 (file)
index 0000000..134d5f6
--- /dev/null
+++ b/compiler/moco-tf/src/Op/Add.test.cpp
@@ -0,0 +1,137 @@
+/*
+ * 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 "TestHelper.h"
+#include "CompilerArgs.h"
+
+#include "Importer.h"
+
+#include "IR/TFAdd.h"
+
+#include <loco.h>
+#include <plier/tf/TestHelper.h>
+
+#include <gtest/gtest.h>
+
+#include <tensorflow/core/framework/graph.pb.h>
+
+#include <cstring>
+#include <memory>
+
+using namespace moco::tf::test;
+
+namespace
+{
+// clang-format off
+const char *add_basic_pbtxt = STRING_CONTENT(
+node {
+  name: "input_01"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+          dim {
+            size: 1
+          }
+          dim {
+            size: 3
+          }
+          dim {
+            size: 4
+          }
+        }
+        float_val: 1.0
+      }
+    }
+  }
+}
+node {
+  name: "input_02"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+          dim {
+            size: 1
+          }
+          dim {
+            size: 3
+          }
+          dim {
+            size: 4
+          }
+        }
+        float_val: 2.0
+      }
+    }
+  }
+}
+node {
+  name: "ADD_01"
+  op: "Add"
+  input: "input_01"
+  input: "input_02"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+}
+);
+// clang-format on
+
+} // namespace
+
+TEST(TensorFlowImport, tf_add_basic)
+{
+  // load graph
+  moco::tf::Importer importer;
+  moco::tf::ModelSignature signature;
+  signature.add_output(moco::tf::TensorName("ADD_01", 0));
+
+  tensorflow::GraphDef graph_def;
+  EXPECT_TRUE(plier::tf::parse_graphdef(add_basic_pbtxt, graph_def));
+  std::unique_ptr<loco::Graph> graph = importer.import(signature, graph_def);
+
+  // what to test:
+  // - TFAdd node should exist
+  // - both inputs x() and y() should not be null
+
+  auto add_node = moco::tf::test::find_first_node_bytype<moco::tf::TFAdd>(graph.get());
+
+  ASSERT_NE(add_node, nullptr);
+  ASSERT_NE(add_node->x(), nullptr);
+  ASSERT_NE(add_node->y(), nullptr);
+}