From: 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com>
Date: Fri, 1 Nov 2019 01:54:20 +0000 (+0900)
Subject: [tf2tflite] Use moco namespace types not alias (#8680)
X-Git-Tag: submit/tizen/20191205.083104~463
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cee7475f72762669732229ec15c2baf66ea0d36;p=platform%2Fcore%2Fml%2Fnnfw.git

[tf2tflite] Use moco namespace types not alias (#8680)

This will update to not to use alias moco::tf namespace

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

diff --git a/compiler/tf2tflite/src/CustomopConfLoader.cpp b/compiler/tf2tflite/src/CustomopConfLoader.cpp
index 726b066..7399a43 100644
--- a/compiler/tf2tflite/src/CustomopConfLoader.cpp
+++ b/compiler/tf2tflite/src/CustomopConfLoader.cpp
@@ -96,7 +96,7 @@ angkor::TensorShape get_shape_attr(const tf2tflite::CustomOpDef &custom_op)
   return convert_shape(shape_def);
 }
 
-void add_customop(tf2tflite::CustomOpInfoDef &def, moco::tf::ModelSignature &sig)
+void add_customop(tf2tflite::CustomOpInfoDef &def, moco::ModelSignature &sig)
 {
   for (const auto &custom_op : def.custom_op())
   {
@@ -115,7 +115,7 @@ void add_customop(tf2tflite::CustomOpInfoDef &def, moco::tf::ModelSignature &sig
 namespace tf2tflite
 {
 
-void load_customop_conf(const std::string &path, moco::tf::ModelSignature &sig)
+void load_customop_conf(const std::string &path, moco::ModelSignature &sig)
 {
   CustomOpInfoDef def;
 
diff --git a/compiler/tf2tflite/src/CustomopConfLoader.h b/compiler/tf2tflite/src/CustomopConfLoader.h
index da3ab3d..4f5f3a6 100644
--- a/compiler/tf2tflite/src/CustomopConfLoader.h
+++ b/compiler/tf2tflite/src/CustomopConfLoader.h
@@ -25,7 +25,7 @@ namespace tf2tflite
 {
 
 /// @brief Loads customop.conf into ModelSignature
-void load_customop_conf(const std::string &path, moco::tf::ModelSignature &sig);
+void load_customop_conf(const std::string &path, moco::ModelSignature &sig);
 
 } // namespace tf2tflite
 
diff --git a/compiler/tf2tflite/src/Driver.cpp b/compiler/tf2tflite/src/Driver.cpp
index bdefed4..e43d30b 100644
--- a/compiler/tf2tflite/src/Driver.cpp
+++ b/compiler/tf2tflite/src/Driver.cpp
@@ -39,7 +39,7 @@
 namespace
 {
 
-std::unique_ptr<loco::Graph> import(const moco::tf::ModelSignature &sig, const std::string &path)
+std::unique_ptr<loco::Graph> import(const moco::ModelSignature &sig, const std::string &path)
 {
   moco::tf::Frontend frontend;
   return frontend.load(sig, path.c_str(), moco::tf::Frontend::FileType::Binary);
@@ -115,19 +115,19 @@ int main(int argc, char **argv)
 
   std::cout << "Read '" << info_path << "'" << std::endl;
 
-  moco::tf::ModelSignature sig;
+  moco::ModelSignature sig;
   {
     for (const auto &info : nnkit::support::tftestinfo::parse(info_path.c_str()))
     {
       switch (info->kind())
       {
         case nnkit::support::tftestinfo::ParsedTensor::Kind::Input:
-          sig.add_input(moco::tf::TensorName{info->name()});
+          sig.add_input(moco::TensorName{info->name()});
           sig.shape(info->name(), info->shape());
           break;
 
         case nnkit::support::tftestinfo::ParsedTensor::Kind::Output:
-          sig.add_output(moco::tf::TensorName{info->name()});
+          sig.add_output(moco::TensorName{info->name()});
           sig.shape(info->name(), info->shape());
           break;