From: 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com>
Date: Mon, 22 Apr 2019 01:49:24 +0000 (+0900)
Subject: [moco] register op and do convert (#3329)
X-Git-Tag: nncc_backup~691
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8a3f0b3e9e916d3d7fdc9656450625d82636495;p=platform%2Fcore%2Fml%2Fnnfw.git

[moco] register op and do convert (#3329)

This will register two operators conversion and enable conversion

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

diff --git a/contrib/moco/lib/frontend/tf/src/Frontend.cpp b/contrib/moco/lib/frontend/tf/src/Frontend.cpp
index 26620f0..f687144 100644
--- a/contrib/moco/lib/frontend/tf/src/Frontend.cpp
+++ b/contrib/moco/lib/frontend/tf/src/Frontend.cpp
@@ -207,23 +207,7 @@ std::unique_ptr<loco::Graph> Frontend::load(const ModelSignature &signature, con
 
   auto graph = loco::make_graph();
 
-  // TODO convert tf_graph_def
-  for (const auto &n : tf_graph_def.node())
-  {
-    if (const auto *graph_builder = GraphBuilderRegistry::get().lookup(n.op()))
-    {
-      if (!graph_builder->validate(n))
-      {
-        throw std::runtime_error{"Invalid operator: " + n.op()};
-      }
-
-      // TODO call build
-    }
-    else
-    {
-      // TODO handle for not supported op
-    }
-  }
+  convert_graph(signature, tf_graph_def, graph.get());
 
   return std::move(graph);
 }
diff --git a/contrib/moco/lib/frontend/tf/src/GraphBuilderRegistry.h b/contrib/moco/lib/frontend/tf/src/GraphBuilderRegistry.h
index 48d2d1f..44de16a 100644
--- a/contrib/moco/lib/frontend/tf/src/GraphBuilderRegistry.h
+++ b/contrib/moco/lib/frontend/tf/src/GraphBuilderRegistry.h
@@ -19,6 +19,11 @@
 
 #include "GraphBuilder.h"
 
+#include "Op/Placeholder.h"
+#include "Op/Identity.h"
+
+#include <stdex/Memory.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -55,7 +60,8 @@ public:
 private:
   GraphBuilderRegistry()
   {
-    // TODO fill in GraphBuilders
+    _builder_map["Placeholder"] = stdex::make_unique<PlaceholderGraphBuilder>();
+    _builder_map["Identity"] = stdex::make_unique<IdentityGraphBuilder>();
   }
 
 private: