[exo-tflite] enclosing namespace exo (#7577)

This commit enclosed codes with `namespace exo`.

Signed-off-by: Hyun Sik Yoon <hyunsik.yoon@samsung.com>

diff --git a/compiler/exo-tflite/src/ExporterUtils.cpp b/compiler/exo-tflite/src/ExporterUtils.cpp
index 84143d7..219eac2 100644 (file)
--- a/compiler/exo-tflite/src/ExporterUtils.cpp
+++ b/compiler/exo-tflite/src/ExporterUtils.cpp
@@ -16,6 +16,9 @@
 
 #include "ExporterUtils.h"
 
+namespace exo
+{
+
 ShapeDescription to_shape_description(const loco::TensorShape &shape)
 {
   ShapeDescription res;
@@ -201,3 +204,5 @@ TFLTensorIndex get_tensor_index(loco::Node *node)
   assert(node->annot<TFLTensorIndexAnnotation>() != nullptr);
   return node->annot<TFLTensorIndexAnnotation>()->index();
 }
+
+} // namespace exo

diff --git a/compiler/exo-tflite/src/ExporterUtils.h b/compiler/exo-tflite/src/ExporterUtils.h
index fedaaaa..1b5bc6a 100644 (file)
--- a/compiler/exo-tflite/src/ExporterUtils.h
+++ b/compiler/exo-tflite/src/ExporterUtils.h
@@ -25,6 +25,9 @@
 
 #include <unordered_map>
 
+namespace exo
+{
+
 struct OpCode
 {
   tflite::BuiltinOperator opcode;
@@ -32,16 +35,21 @@ struct OpCode
   bool operator==(const OpCode &rhs) const { return opcode == rhs.opcode; }
 };
 
+} // namespace exo
+
 namespace std
 {
 
-template <> struct hash<OpCode>
+template <> struct hash<exo::OpCode>
 {
-  size_t operator()(const OpCode &x) const { return hash<int>()(x.opcode); }
+  size_t operator()(const exo::OpCode &x) const { return hash<int>()(x.opcode); }
 };
 
 } // namespace std
 
+namespace exo
+{
+
 struct ShapeDescription
 {
   std::vector<int32_t> _dims;
@@ -114,4 +122,6 @@ using TFLTensorIndex = int32_t;
 void set_tensor_index(loco::Node *node, const TFLTensorIndex &tensor_id);
 TFLTensorIndex get_tensor_index(loco::Node *node);
 
+} // namespace exo
+
 #endif // __EXPORTER_UTILS_H__

diff --git a/compiler/exo-tflite/src/OperationExporter.cpp b/compiler/exo-tflite/src/OperationExporter.cpp
index c302955..59fcf19 100644 (file)
--- a/compiler/exo-tflite/src/OperationExporter.cpp
+++ b/compiler/exo-tflite/src/OperationExporter.cpp
@@ -36,6 +36,8 @@ using namespace tflite;
 namespace
 {
 
+using namespace exo;
+
 class OperationExporter final : public locoex::TFLNodeMutableVisitor<void>,
                                 public loco::CanonicalNodeMutableVisitor<void>
 {
@@ -790,6 +792,9 @@ void exportNode(loco::Node *node, flatbuffers::FlatBufferBuilder &builder,
 
 } // namespace
 
+namespace exo
+{
+
 void exportNodes(loco::Graph *g, FlatBufferBuilder &builder, SerializedModelData &gd)
 {
   for (auto node : loco::postorder_traversal(loco::output_nodes(g)))
@@ -797,3 +802,5 @@ void exportNodes(loco::Graph *g, FlatBufferBuilder &builder, SerializedModelData
     exportNode(node, builder, gd);
   }
 }
+
+} // namespace exo

diff --git a/compiler/exo-tflite/src/OperationExporter.h b/compiler/exo-tflite/src/OperationExporter.h
index ac40445..3eef8d9 100644 (file)
--- a/compiler/exo-tflite/src/OperationExporter.h
+++ b/compiler/exo-tflite/src/OperationExporter.h
@@ -21,6 +21,9 @@
 
 #include <loco/IR/Graph.h>
 
+namespace exo
+{
+
 /**
  * @brief create Operators corresponding to model nodes
  * @param nodes container with nodes
@@ -28,4 +31,6 @@
  */
 void exportNodes(loco::Graph *g, flatbuffers::FlatBufferBuilder &builder, SerializedModelData &gd);
 
+} // namespace exo
+
 #endif // __OPERATION_EXPORTER_H__

diff --git a/compiler/exo-tflite/src/ShapeInference.cpp b/compiler/exo-tflite/src/ShapeInference.cpp
index 4ca4599..cd40db5 100644 (file)
--- a/compiler/exo-tflite/src/ShapeInference.cpp
+++ b/compiler/exo-tflite/src/ShapeInference.cpp
@@ -29,6 +29,9 @@
 #include <locoex/COpDialect.h>
 #include <locoex/Service/COpShapeInferenceRule.h>
 
+namespace exo
+{
+
 void ShapeInference::run(loco::Graph *g)
 {
   // TODO Adjust indentation level
@@ -57,3 +60,5 @@ ShapeDescription ShapeInference::get(loco::Node *node)
     return to_shape_description(loco::shape_get(node));
   }
 }
+
+} // namespace exo

diff --git a/compiler/exo-tflite/src/ShapeInference.h b/compiler/exo-tflite/src/ShapeInference.h
index 86c0c59..ec48416 100644 (file)
--- a/compiler/exo-tflite/src/ShapeInference.h
+++ b/compiler/exo-tflite/src/ShapeInference.h
@@ -21,6 +21,9 @@
 
 #include <loco/IR/Nodes.h>
 
+namespace exo
+{
+
 /**
  * @brief Annotate the shape of each node as a node annotation
  *
@@ -37,4 +40,6 @@ struct ShapeInference
   static ShapeDescription get(loco::Node *node);
 };
 
+} // namespace exo
+
 #endif // __SHAPE_INFERENCE_H__

diff --git a/compiler/exo-tflite/src/TFLExporterImpl.cpp b/compiler/exo-tflite/src/TFLExporterImpl.cpp
index ebe98ca..dcb37fb 100644 (file)
--- a/compiler/exo-tflite/src/TFLExporterImpl.cpp
+++ b/compiler/exo-tflite/src/TFLExporterImpl.cpp
@@ -35,6 +35,8 @@
 namespace
 {
 
+using namespace exo;
+
 void registerGraphInputTensors(loco::Graph *graph, SubGraphContext &ctx)
 {
   for (uint32_t n = 0; n < graph->inputs()->size(); ++n)
@@ -92,7 +94,7 @@ encodeOperatorCodes(FlatBufferBuilder &builder, std::unordered_map<OpCode, uint3
   return builder.CreateVector(operator_codes_vec);
 }
 
-flatbuffers::Offset<tflite::SubGraph> TFLExporter::Impl::exportSubgraph(SerializedModelData &gd)
+::flatbuffers::Offset<::tflite::SubGraph> TFLExporter::Impl::exportSubgraph(SerializedModelData &gd)
 {
   auto tensors = _builder.CreateVector(gd._tensors);
   auto inputs = _builder.CreateVector(gd._inputs);

diff --git a/compiler/exo-tflite/src/TFLExporterImpl.h b/compiler/exo-tflite/src/TFLExporterImpl.h
index 9e75086..96b6bf5 100644 (file)
--- a/compiler/exo-tflite/src/TFLExporterImpl.h
+++ b/compiler/exo-tflite/src/TFLExporterImpl.h
@@ -22,11 +22,11 @@
 
 #include <loco.h>
 
-struct SerializedModelData;
-
 namespace exo
 {
 
+struct SerializedModelData;
+
 /**
  * internal implementation of interface exporter class
  */
@@ -66,6 +66,6 @@ private:
   flatbuffers::FlatBufferBuilder _builder;
 };
 
-} // namespace loco_exporter
+} // namespace exo
 
 #endif // __TFL_EXPORTER_IMPL_H__

diff --git a/compiler/exo-tflite/src/TensorExporter.cpp b/compiler/exo-tflite/src/TensorExporter.cpp
index e329db1..1c84a8b 100644 (file)
--- a/compiler/exo-tflite/src/TensorExporter.cpp
+++ b/compiler/exo-tflite/src/TensorExporter.cpp
@@ -29,6 +29,8 @@ using namespace flatbuffers;
 namespace
 {
 
+using namespace exo;
+
 class TFLTensorInfo
 {
 public:
@@ -171,6 +173,9 @@ flatbuffers::Offset<tflite::Buffer> encodeOpBuffer(FlatBufferBuilder &builder, l
 
 } // namespace
 
+namespace exo
+{
+
 void exportOpDefinedTensor(const TFLTensorInfo &info, FlatBufferBuilder &builder,
                            SerializedModelData &gd)
 {
@@ -211,3 +216,5 @@ void exportOpDefinedTensors(loco::Graph *g, FlatBufferBuilder &builder, Serializ
     exportOpDefinedTensor(tensor_info, builder, gd);
   }
 }
+
+} // namespace exo

diff --git a/compiler/exo-tflite/src/TensorExporter.h b/compiler/exo-tflite/src/TensorExporter.h
index 4c1902a..0daf4c1 100644 (file)
--- a/compiler/exo-tflite/src/TensorExporter.h
+++ b/compiler/exo-tflite/src/TensorExporter.h
@@ -23,6 +23,9 @@
 
 #include <flatbuffers/flatbuffers.h>
 
+namespace exo
+{
+
 /**
  * @brief create Tensors corresponding to results of all nodes in graph
  * @param computational graph
@@ -31,4 +34,6 @@
 void exportOpDefinedTensors(loco::Graph *g, flatbuffers::FlatBufferBuilder &builder,
                             SerializedModelData &gd);
 
+} // namespace exo
+
 #endif // __TENSOR_EXPORTER_H__

diff --git a/compiler/exo-tflite/src/TypeInference.cpp b/compiler/exo-tflite/src/TypeInference.cpp
index 69a8a74..29f9678 100644 (file)
--- a/compiler/exo-tflite/src/TypeInference.cpp
+++ b/compiler/exo-tflite/src/TypeInference.cpp
@@ -68,6 +68,9 @@ tflite::TensorType translateLocoTypeToTFLite(loco::DataType dtype)
 
 } // namespace
 
+namespace exo
+{
+
 void TypeInference::run(loco::Graph *g)
 {
   loco::CanonicalTypeInferenceRule canonical_rule;
@@ -88,3 +91,5 @@ tflite::TensorType TypeInference::get(loco::Node *node)
   assert(loco::dtype_known(node));
   return translateLocoTypeToTFLite(loco::dtype_get(node));
 }
+
+} // namespace exo

diff --git a/compiler/exo-tflite/src/TypeInference.h b/compiler/exo-tflite/src/TypeInference.h
index 848549e..f66b6bd 100644 (file)
--- a/compiler/exo-tflite/src/TypeInference.h
+++ b/compiler/exo-tflite/src/TypeInference.h
@@ -21,6 +21,9 @@
 
 #include <loco/IR/Nodes.h>
 
+namespace exo
+{
+
 /**
  * @brief Annotate the type of each node as NodeAnnotation
  *
@@ -38,4 +41,6 @@ struct TypeInference
   static tflite::TensorType get(loco::Node *node);
 };
 
+} // namespace exo
+
 #endif // __TYPE_INFERENCE_H__

diff --git a/compiler/exo-tflite/src/TypeInference.test.cpp b/compiler/exo-tflite/src/TypeInference.test.cpp
index 10cad8f..19777b6 100644 (file)
--- a/compiler/exo-tflite/src/TypeInference.test.cpp
+++ b/compiler/exo-tflite/src/TypeInference.test.cpp
@@ -107,6 +107,8 @@ TEST_F(TypeInferenceTest, Regression_0000)
   auto relu = addReLULayer();
   auto push = addPushLayer();
 
+  using namespace exo;
+
   TypeInference::run(graph());
 
   ASSERT_EQ(TypeInference::get(relu), tflite::TensorType_INT8);