[exo.tflite] Restrict TypeContext's visibility (#4159)

TypeInference is the only module that accesses TypeContext.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/exo-tflite/src/ExporterUtils.h b/contrib/exo-tflite/src/ExporterUtils.h
index 4cb3626..054b560 100644 (file)
--- a/contrib/exo-tflite/src/ExporterUtils.h
+++ b/contrib/exo-tflite/src/ExporterUtils.h
@@ -48,14 +48,6 @@ struct ShapeDescription
 };
 
 /**
- * @brief Record the data type of each loco node
- */
-struct TypeContext
-{
-  std::unordered_map<loco::Node *, tflite::TensorType> _node_to_type;
-};
-
-/**
  * @brief Record the (tensor) shape of each loco node
  */
 struct ShapeContext
@@ -77,7 +69,7 @@ struct SubGraphContext
 };
 
 // Prerequisites for tflite::Model object creation
-struct SerializedModelData final : public ShapeContext, public TypeContext, public SubGraphContext
+struct SerializedModelData final : public ShapeContext, public SubGraphContext
 {
   SerializedModelData() = default;
   SerializedModelData(const SerializedModelData &) = delete;

diff --git a/contrib/exo-tflite/src/TypeInference.cpp b/contrib/exo-tflite/src/TypeInference.cpp
index b4e693f..904b600 100644 (file)
--- a/contrib/exo-tflite/src/TypeInference.cpp
+++ b/contrib/exo-tflite/src/TypeInference.cpp
@@ -62,6 +62,14 @@ T ceil_div(T dividend, T divisor)
   return (dividend + divisor - 1) / divisor;
 }
 
+/**
+ * @brief Record the data type of each loco node
+ */
+struct TypeContext
+{
+  std::unordered_map<loco::Node *, tflite::TensorType> _node_to_type;
+};
+
 } // namespace
 
 tflite::TensorType getOpResultType(loco::ConstGen *node, TypeContext &)