From 97eca4b7f8dc066c269e61ddd352e657955b6a00 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=91=D0=B0=D1=80?=
 =?utf8?q?=D0=B0=D0=BD=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2/AI=20Tools=20Lab=20/S?=
 =?utf8?q?RR/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?=
 <s.barannikov@samsung.com>
Date: Mon, 5 Aug 2019 19:45:07 +0300
Subject: [PATCH] [mir_caffe] Rename namespace nnc to mir_caffe in Caffe
 importer (#6239)

* Rename namespace and include guards in Caffe importer
* Fix usages of the namespace in `nnc`

Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>
---
 compiler/mir-caffe-importer/caffe_importer.cpp             |  4 ++--
 compiler/mir-caffe-importer/caffe_importer.h               | 10 +++++-----
 compiler/mir-caffe-importer/caffe_op_creator.cpp           |  4 ++--
 compiler/mir-caffe-importer/caffe_op_creator.h             | 10 +++++-----
 compiler/mir-caffe-importer/caffe_op_types.h               | 10 +++++-----
 compiler/nnc/passes/caffe_frontend/caffe_importer_pass.cpp |  2 +-
 compiler/nnc/passes/caffe_frontend/caffe_importer_pass.h   |  8 ++++++--
 7 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/compiler/mir-caffe-importer/caffe_importer.cpp b/compiler/mir-caffe-importer/caffe_importer.cpp
index 97bd011..359a97d 100644
--- a/compiler/mir-caffe-importer/caffe_importer.cpp
+++ b/compiler/mir-caffe-importer/caffe_importer.cpp
@@ -33,7 +33,7 @@
 #include <utility>
 #include <vector>
 
-namespace nnc
+namespace mir_caffe
 {
 
 using namespace ::caffe;
@@ -324,4 +324,4 @@ const std::map<std::string, CaffeOpType> CaffeImporter::_operatorTypes = {
     {"Tile", CaffeOpType::tile},
     {"WindowData", CaffeOpType::windowData}};
 
-} // namespace nnc
+} // namespace mir_caffe
diff --git a/compiler/mir-caffe-importer/caffe_importer.h b/compiler/mir-caffe-importer/caffe_importer.h
index 6f5f535..4726c7b 100644
--- a/compiler/mir-caffe-importer/caffe_importer.h
+++ b/compiler/mir-caffe-importer/caffe_importer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef NNCC_CAFFE_IMPORTER_H
-#define NNCC_CAFFE_IMPORTER_H
+#ifndef MIR_CAFFE_IMPORTER_H
+#define MIR_CAFFE_IMPORTER_H
 
 #include <set>
 #include <string>
@@ -25,7 +25,7 @@
 #include "caffe_op_creator.h"
 #include "caffe_op_types.h"
 
-namespace nnc
+namespace mir_caffe
 {
 
 class CaffeImporter
@@ -83,6 +83,6 @@ private:
   void processDeprecatedInput();
 };
 
-} // namespace nnc
+} // namespace mir_caffe
 
-#endif // NNCC_CAFFE_IMPORTER_H
+#endif // MIR_CAFFE_IMPORTER_H
diff --git a/compiler/mir-caffe-importer/caffe_op_creator.cpp b/compiler/mir-caffe-importer/caffe_op_creator.cpp
index b1a07bb..4e13681 100644
--- a/compiler/mir-caffe-importer/caffe_op_creator.cpp
+++ b/compiler/mir-caffe-importer/caffe_op_creator.cpp
@@ -48,7 +48,7 @@
 #include <iostream>
 #include <set>
 
-namespace nnc
+namespace mir_caffe
 {
 
 static TensorVariant fixGroupedKernel(int groups, const TensorVariant &folded_kernel)
@@ -925,4 +925,4 @@ CaffeOpCreator::convertLSTM(const caffe::LayerParameter &layer,
   return {createOp<ops::ConcatOp>("", h_slices, 0)->getOutput(0)};
 }
 
-} // namespace nnc
+} // namespace mir_caffe
diff --git a/compiler/mir-caffe-importer/caffe_op_creator.h b/compiler/mir-caffe-importer/caffe_op_creator.h
index 02ea9c2..b57d098 100644
--- a/compiler/mir-caffe-importer/caffe_op_creator.h
+++ b/compiler/mir-caffe-importer/caffe_op_creator.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef NNCC_CAFFE_OP_CREATOR_H
-#define NNCC_CAFFE_OP_CREATOR_H
+#ifndef MIR_CAFFE_OP_CREATOR_H
+#define MIR_CAFFE_OP_CREATOR_H
 
 #include <set>
 #include <map>
@@ -29,7 +29,7 @@
 
 #include "caffe/proto/caffe.pb.h"
 
-namespace nnc
+namespace mir_caffe
 {
 
 using mir::TensorVariant;
@@ -153,6 +153,6 @@ mir::Operation *CaffeOpCreator::createOp(const std::string &name, Types &&... ar
   return _graph->create<OpType>(name, std::forward<Types>(args)...);
 }
 
-} // namespace nnc
+} // namespace mir_caffe
 
-#endif // NNCC_CAFFE_OP_CREATOR_H
+#endif // MIR_CAFFE_OP_CREATOR_H
diff --git a/compiler/mir-caffe-importer/caffe_op_types.h b/compiler/mir-caffe-importer/caffe_op_types.h
index 44ef2e6..30fce7d 100644
--- a/compiler/mir-caffe-importer/caffe_op_types.h
+++ b/compiler/mir-caffe-importer/caffe_op_types.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef NNCC_CAFFE_OP_TYPES_H
-#define NNCC_CAFFE_OP_TYPES_H
+#ifndef MIR_CAFFE_OP_TYPES_H
+#define MIR_CAFFE_OP_TYPES_H
 
-namespace nnc
+namespace mir_caffe
 {
 
 enum class CaffeOpType
@@ -84,6 +84,6 @@ enum class CaffeOpType
   windowData
 };
 
-} // namespace nnc
+} // namespace mir_caffe
 
-#endif // NNCC_CAFFE_OP_TYPES_H
+#endif // MIR_CAFFE_OP_TYPES_H
diff --git a/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.cpp b/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.cpp
index 3633d62..48db819 100644
--- a/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.cpp
+++ b/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.cpp
@@ -22,7 +22,7 @@ namespace nnc
 {
 
 CaffeImporterPass::CaffeImporterPass(const std::string &filename)
-    : _pimpl(new CaffeImporter(filename))
+    : _pimpl(new mir_caffe::CaffeImporter(filename))
 {
 }
 
diff --git a/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.h b/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.h
index 4f53dea..3baa46f 100644
--- a/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.h
+++ b/compiler/nnc/passes/caffe_frontend/caffe_importer_pass.h
@@ -22,9 +22,13 @@
 #include <memory>
 #include <string>
 
-namespace nnc
+namespace mir_caffe
 {
 class CaffeImporter;
+} // namespace mir_caffe
+
+namespace nnc
+{
 
 class CaffeImporterPass : public NNImporter
 {
@@ -38,7 +42,7 @@ public:
   ~CaffeImporterPass() override;
 
 private:
-  std::unique_ptr<CaffeImporter> _pimpl;
+  std::unique_ptr<mir_caffe::CaffeImporter> _pimpl;
   std::unique_ptr<mir::Graph> _graph;
 };
 
-- 
2.7.4