[DRAFT][tflchef] Support multiple subgraphs

This draft adds supporting of multiple subgraphs and While operation. ONE-DCO-1.0-Signed-off-by: Artem Balyshev <[email protected]>
Samsung · Jan 23, 2024 · 0eb1989 · 0eb1989
1 parent 9890845
commit 0eb1989
Show file tree

Hide file tree

Showing 236 changed files with 1,827 additions and 555 deletions.
diff --git a/compiler/souschef/include/souschef/TensorFiller.h b/compiler/souschef/include/souschef/TensorFiller.h
@@ -85,7 +85,7 @@ class TensorFiller
     return false;
   }
 
-private:
+protected:
   std::map<uint32_t, bool> _tensor_filler{};
   std::map<uint32_t, std::vector<int32_t>> _tensor_filler_vint32{};
   std::map<uint32_t, std::vector<float>> _tensor_filler_vfloat{};

diff --git a/compiler/tflchef/tflite/src/Op/Abs.cpp b/compiler/tflchef/tflite/src/Op/Abs.cpp
@@ -28,9 +28,18 @@ void TFliteOpAbs::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpAbs::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
+                                       tflchef::ModelRecipe *model_recipe,
+                                       tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("Abs");
 

diff --git a/compiler/tflchef/tflite/src/Op/Add.cpp b/compiler/tflchef/tflite/src/Op/Add.cpp
@@ -31,12 +31,21 @@ void TFliteOpAdd::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpAdd::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
+                                       tflchef::ModelRecipe *model_recipe,
+                                       tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_AddOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("Add");
 

diff --git a/compiler/tflchef/tflite/src/Op/AddN.cpp b/compiler/tflchef/tflite/src/Op/AddN.cpp
@@ -34,9 +34,18 @@ void TFliteOpAddN::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpAddN::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
+                                        tflchef::ModelRecipe *model_recipe,
+                                        tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("AddN");
 

diff --git a/compiler/tflchef/tflite/src/Op/ArgMax.cpp b/compiler/tflchef/tflite/src/Op/ArgMax.cpp
@@ -35,12 +35,21 @@ void TFliteOpArgMax::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpArgMax::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
+                                          tflchef::ModelRecipe *model_recipe,
+                                          tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_ArgMaxOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("ArgMax");
 

diff --git a/compiler/tflchef/tflite/src/Op/ArgMin.cpp b/compiler/tflchef/tflite/src/Op/ArgMin.cpp
@@ -35,12 +35,21 @@ void TFliteOpArgMin::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpArgMin::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
+                                          tflchef::ModelRecipe *model_recipe,
+                                          tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_ArgMinOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("ArgMin");
 

diff --git a/compiler/tflchef/tflite/src/Op/AveragePool2D.cpp b/compiler/tflchef/tflite/src/Op/AveragePool2D.cpp
@@ -28,12 +28,21 @@ void TFliteOpAveragePool2D::filler(const tflite::Operator *op, TFliteImport *imp
 }
 
 tflchef::Operation *TFliteOpAveragePool2D::build(const tflite::Operator *op, TFliteImport *import,
-                                                 tflchef::ModelRecipe *model_recipe) const
+                                                 tflchef::ModelRecipe *model_recipe,
+                                                 tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_Pool2DOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("AveragePool2D");
 

diff --git a/compiler/tflchef/tflite/src/Op/BatchMatMul.cpp b/compiler/tflchef/tflite/src/Op/BatchMatMul.cpp
@@ -28,9 +28,18 @@ void TFliteOpBatchMatMul::filler(const tflite::Operator *op, TFliteImport *impor
 }
 
 tflchef::Operation *TFliteOpBatchMatMul::build(const tflite::Operator *op, TFliteImport *import,
-                                               tflchef::ModelRecipe *model_recipe) const
+                                               tflchef::ModelRecipe *model_recipe,
+                                               tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("BatchMatMul");
 

diff --git a/compiler/tflchef/tflite/src/Op/BatchToSpaceND.cpp b/compiler/tflchef/tflite/src/Op/BatchToSpaceND.cpp
@@ -41,9 +41,18 @@ void TFliteOpBatchToSpaceND::filler(const tflite::Operator *op, TFliteImport *im
 }
 
 tflchef::Operation *TFliteOpBatchToSpaceND::build(const tflite::Operator *op, TFliteImport *import,
-                                                  tflchef::ModelRecipe *model_recipe) const
+                                                  tflchef::ModelRecipe *model_recipe,
+                                                  tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("BatchToSpaceND");
 

diff --git a/compiler/tflchef/tflite/src/Op/BidirectionalSequenceLSTM.cpp b/compiler/tflchef/tflite/src/Op/BidirectionalSequenceLSTM.cpp
@@ -41,14 +41,23 @@ void TFliteOpBidirectionalSequenceLSTM::filler(const tflite::Operator *op, TFlit
   }
 }
 
-tflchef::Operation *
-TFliteOpBidirectionalSequenceLSTM::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
+tflchef::Operation *TFliteOpBidirectionalSequenceLSTM::build(const tflite::Operator *op,
+                                                             TFliteImport *import,
+                                                             tflchef::ModelRecipe *model_recipe,
+                                                             tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_BidirectionalSequenceLSTMOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("BidirectionalSequenceLSTM");
 

diff --git a/compiler/tflchef/tflite/src/Op/BroadcastTo.cpp b/compiler/tflchef/tflite/src/Op/BroadcastTo.cpp
@@ -32,9 +32,18 @@ void TFliteOpBroadcastTo::filler(const tflite::Operator *op, TFliteImport *impor
 }
 
 tflchef::Operation *TFliteOpBroadcastTo::build(const tflite::Operator *op, TFliteImport *import,
-                                               tflchef::ModelRecipe *model_recipe) const
+                                               tflchef::ModelRecipe *model_recipe,
+                                               tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("BroadcastTo");
 

diff --git a/compiler/tflchef/tflite/src/Op/Cast.cpp b/compiler/tflchef/tflite/src/Op/Cast.cpp
@@ -28,12 +28,21 @@ void TFliteOpCast::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpCast::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
+                                        tflchef::ModelRecipe *model_recipe,
+                                        tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_CastOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("Cast");
 

diff --git a/compiler/tflchef/tflite/src/Op/Ceil.cpp b/compiler/tflchef/tflite/src/Op/Ceil.cpp
@@ -27,9 +27,18 @@ void TFliteOpCeil::filler(const tflite::Operator *, TFliteImport *, tflchef::Mod
 }
 
 tflchef::Operation *TFliteOpCeil::build(const tflite::Operator *, TFliteImport *,
-                                        tflchef::ModelRecipe *model_recipe) const
+                                        tflchef::ModelRecipe *model_recipe,
+                                        tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("Ceil");
 

diff --git a/compiler/tflchef/tflite/src/Op/Concatenation.cpp b/compiler/tflchef/tflite/src/Op/Concatenation.cpp
@@ -28,12 +28,21 @@ void TFliteOpConcatenation::filler(const tflite::Operator *op, TFliteImport *imp
 }
 
 tflchef::Operation *TFliteOpConcatenation::build(const tflite::Operator *op, TFliteImport *import,
-                                                 tflchef::ModelRecipe *model_recipe) const
+                                                 tflchef::ModelRecipe *model_recipe,
+                                                 tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_ConcatenationOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("Concatenation");
 

diff --git a/compiler/tflchef/tflite/src/Op/Conv2D.cpp b/compiler/tflchef/tflite/src/Op/Conv2D.cpp
@@ -35,12 +35,21 @@ void TFliteOpConv2D::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpConv2D::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
+                                          tflchef::ModelRecipe *model_recipe,
+                                          tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_Conv2DOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("Conv2D");
 

diff --git a/compiler/tflchef/tflite/src/Op/Cos.cpp b/compiler/tflchef/tflite/src/Op/Cos.cpp
@@ -28,9 +28,18 @@ void TFliteOpCos::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpCos::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
+                                       tflchef::ModelRecipe *model_recipe,
+                                       tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("Cos");
 

diff --git a/compiler/tflchef/tflite/src/Op/CumSum.cpp b/compiler/tflchef/tflite/src/Op/CumSum.cpp
@@ -34,12 +34,21 @@ void TFliteOpCumsum::filler(const tflite::Operator *op, TFliteImport *import,
 }
 
 tflchef::Operation *TFliteOpCumsum::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
+                                          tflchef::ModelRecipe *model_recipe,
+                                          tflchef::Graph *model_graph) const
 {
   auto op_params = op->builtin_options_as_CumsumOptions();
   assert(op_params != nullptr);
 
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("CumSum");
   auto op_options = operation->mutable_cumsum_options();

diff --git a/compiler/tflchef/tflite/src/Op/DepthToSpace.cpp b/compiler/tflchef/tflite/src/Op/DepthToSpace.cpp
@@ -28,9 +28,18 @@ void TFliteOpDepthToSpace::filler(const tflite::Operator *op, TFliteImport *impo
 }
 
 tflchef::Operation *TFliteOpDepthToSpace::build(const tflite::Operator *op, TFliteImport *import,
-                                                tflchef::ModelRecipe *model_recipe) const
+                                                tflchef::ModelRecipe *model_recipe,
+                                                tflchef::Graph *model_graph) const
 {
-  auto operation = model_recipe->add_operation();
+  tflchef::Operation *operation = nullptr;
+  if (model_graph)
+  {
+    operation = model_graph->add_operation();
+  }
+  else
+  {
+    operation = model_recipe->add_operation();
+  }
 
   operation->set_type("DepthToSpace");