From 9342a9047073b46ee2c3aae09446d55141a95c6c Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/On-Device=20Lab=28SR=29/Princip?=
 =?utf8?q?al=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?=
 <saehie.park@samsung.com>
Date: Thu, 27 Jun 2019 12:05:14 +0900
Subject: [PATCH] [moco_tf] Introduce common import in Frontend (#3992)

* [moco_tf] Introduce common import in Frontend

This will introduce private import method in Frontend as common of load

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

* include header
---
 contrib/moco-tf/include/moco/tf/Frontend.h |  5 +++++
 contrib/moco-tf/src/Frontend.cpp           | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/contrib/moco-tf/include/moco/tf/Frontend.h b/contrib/moco-tf/include/moco/tf/Frontend.h
index d354da7..31a22ce 100644
--- a/contrib/moco-tf/include/moco/tf/Frontend.h
+++ b/contrib/moco-tf/include/moco/tf/Frontend.h
@@ -21,6 +21,8 @@
 
 #include <loco.h>
 
+#include <tensorflow/core/framework/graph.pb.h>
+
 #include <istream>
 #include <memory>
 #include <string>
@@ -62,6 +64,9 @@ public:
 public:
   std::unique_ptr<loco::Graph> load(const ModelSignature &, const char *, FileType) const;
   std::unique_ptr<loco::Graph> load(const ModelSignature &, std::istream *, FileType) const;
+
+private:
+  std::unique_ptr<loco::Graph> import(const ModelSignature &, tensorflow::GraphDef &) const;
 };
 
 /**
diff --git a/contrib/moco-tf/src/Frontend.cpp b/contrib/moco-tf/src/Frontend.cpp
index c669314..6f38f65 100644
--- a/contrib/moco-tf/src/Frontend.cpp
+++ b/contrib/moco-tf/src/Frontend.cpp
@@ -111,13 +111,11 @@ Frontend::Frontend()
 std::unique_ptr<loco::Graph> Frontend::load(const ModelSignature &signature, const char *modelfile,
                                             FileType type) const
 {
-  Import import;
-
   tensorflow::GraphDef tf_graph_def;
 
   load_tf(modelfile, type, tf_graph_def);
 
-  auto graph = import.load(signature, tf_graph_def);
+  auto graph = import(signature, tf_graph_def);
 
   return std::move(graph);
 }
@@ -129,9 +127,7 @@ std::unique_ptr<loco::Graph> Frontend::load(const ModelSignature &signature, std
 
   load_tf(stream, type, tf_graph_def);
 
-  Import import;
-
-  auto graph = import.load(signature, tf_graph_def);
+  auto graph = import(signature, tf_graph_def);
 
   return std::move(graph);
 }
@@ -150,5 +146,15 @@ void cleanup(loco::Graph *graph)
   }
 }
 
+std::unique_ptr<loco::Graph> Frontend::import(const ModelSignature &signature,
+                                              tensorflow::GraphDef &tf_graph_def) const
+{
+  Import import;
+
+  auto graph = import.load(signature, tf_graph_def);
+
+  return std::move(graph);
+}
+
 } // namespace tf
 } // namespace moco
-- 
2.7.4