From 8e8ac621dd4c94dd66bbe35fd4f6502d768ac4a6 Mon Sep 17 00:00:00 2001
From: Slider0007 <jobbelle@gmx.net>
Date: Mon, 12 Feb 2024 00:30:04 +0100
Subject: [PATCH] tflite heap fix

---
 .../jomjol_tfliteclass/CTfLiteClass.cpp       | 41 ++-----------------
 .../jomjol_tfliteclass/CTfLiteClass.h         | 28 ++-----------
 2 files changed, 6 insertions(+), 63 deletions(-)

diff --git a/code/components/jomjol_tfliteclass/CTfLiteClass.cpp b/code/components/jomjol_tfliteclass/CTfLiteClass.cpp
index 1cc76bef..2e0d3f91 100644
--- a/code/components/jomjol_tfliteclass/CTfLiteClass.cpp
+++ b/code/components/jomjol_tfliteclass/CTfLiteClass.cpp
@@ -12,17 +12,9 @@
 
 static const char *TAG = "TFLITE";
 
-/// Static Resolver muss mit allen Operatoren geladen Werden, die benöägit werden - ABER nur 1x --> gesonderte Funktion /////////////////////////////
-static bool MakeStaticResolverDone = false;
-static tflite::MicroMutableOpResolver<15> resolver;
 
-void MakeStaticResolver()
+void CTfLiteClass::MakeStaticResolver()
 {
-  if (MakeStaticResolverDone)
-    return;
-
-  MakeStaticResolverDone = true;
-
   resolver.AddFullyConnected();
   resolver.AddReshape();
   resolver.AddSoftmax();
@@ -34,7 +26,6 @@ void MakeStaticResolver()
   resolver.AddLeakyRelu();
   resolver.AddDequantize();
 }
-////////////////////////////////////////////////////////////////////////////////////////
 
 
 float CTfLiteClass::GetOutputValue(int nr)
@@ -207,9 +198,7 @@ bool CTfLiteClass::LoadInputImageBasis(CImageBasis *rs)
 
 bool CTfLiteClass::MakeAllocate()
 {
-
-  MakeStaticResolver();
-
+    MakeStaticResolver();
 
     #ifdef DEBUG_DETAIL_ON 
         LogFile.WriteHeapInfo("CTLiteClass::Alloc start");
@@ -217,13 +206,11 @@ bool CTfLiteClass::MakeAllocate()
 
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CTfLiteClass::MakeAllocate");
     this->interpreter = new tflite::MicroInterpreter(this->model, resolver, this->tensor_arena, this->kTensorArenaSize);
-//    this->interpreter = new tflite::MicroInterpreter(this->model, resolver, this->tensor_arena, this->kTensorArenaSize, this->error_reporter);
 
     if (this->interpreter) 
     {
         TfLiteStatus allocate_status = this->interpreter->AllocateTensors();
         if (allocate_status != kTfLiteOk) {
-            TF_LITE_REPORT_ERROR(error_reporter, "AllocateTensors() failed");
             LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "AllocateTensors() failed");
 
             this->GetInputDimension();   
@@ -313,13 +300,6 @@ bool CTfLiteClass::ReadFileToModel(std::string _fn)
 
 bool CTfLiteClass::LoadModel(std::string _fn)
 {
-#ifdef SUPRESS_TFLITE_ERRORS
-//    this->error_reporter = new tflite::ErrorReporter;
-    this->error_reporter = new tflite::OwnMicroErrorReporter;
-#else
-    this->error_reporter = new tflite::MicroErrorReporter;
-#endif
-
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CTfLiteClass::LoadModel");
 
     if (!ReadFileToModel(_fn.c_str())) {
@@ -350,21 +330,6 @@ CTfLiteClass::CTfLiteClass()
 CTfLiteClass::~CTfLiteClass()
 {
   delete this->interpreter;
-//  delete this->error_reporter;
 
   psram_free_shared_tensor_arena_and_model_memory();
-}        
-
-#ifdef SUPRESS_TFLITE_ERRORS
-namespace tflite 
-{
-//tflite::ErrorReporter
-//  int OwnMicroErrorReporter::Report(const char* format, va_list args) 
-
-  int OwnMicroErrorReporter::Report(const char* format, va_list args) 
-  {
-    return 0;
-  }
-} 
-#endif
- 
+}        
\ No newline at end of file
diff --git a/code/components/jomjol_tfliteclass/CTfLiteClass.h b/code/components/jomjol_tfliteclass/CTfLiteClass.h
index 86ae7d05..1063735f 100644
--- a/code/components/jomjol_tfliteclass/CTfLiteClass.h
+++ b/code/components/jomjol_tfliteclass/CTfLiteClass.h
@@ -5,39 +5,18 @@
 
 #include "tensorflow/lite/micro/micro_mutable_op_resolver.h"
 #include "tensorflow/lite/micro/micro_interpreter.h"
-#include "tensorflow/lite/micro/micro_mutable_op_resolver.h"
-#include "tensorflow/lite/micro/kernels/micro_ops.h"
-
-#include "tensorflow/lite/micro/tflite_bridge/micro_error_reporter.h"
-#include "tensorflow/lite/micro/micro_interpreter.h"
 #include "tensorflow/lite/schema/schema_generated.h"
-#include "tensorflow/lite/micro/kernels/micro_ops.h"
+
 #include "esp_err.h"
 #include "esp_log.h"
 
 #include "CImageBasis.h"
 
 
-
-#ifdef SUPRESS_TFLITE_ERRORS
-#include "tensorflow/lite/core/api/error_reporter.h"
-#include "tensorflow/lite/micro/compatibility.h"
-#include "tensorflow/lite/micro/debug_log.h"
-///// OwnErrorReporter to prevent printing of Errors (especially unavoidable in CalculateActivationRangeQuantized@kerne_util.cc)
-namespace tflite {
-    class OwnMicroErrorReporter : public ErrorReporter {
-        public:
-           int Report(const char* format, va_list args) override;
-    };
-}  // namespace tflite
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#endif
-
-
 class CTfLiteClass
 {
     protected:
-        tflite::ErrorReporter *error_reporter;
+        tflite::MicroMutableOpResolver<10> resolver;  
         const tflite::Model* model;
         tflite::MicroInterpreter* interpreter;
         TfLiteTensor* output = nullptr;     
@@ -54,6 +33,7 @@ class CTfLiteClass
 
         long GetFileSize(std::string filename);
         bool ReadFileToModel(std::string _fn);
+        void MakeStaticResolver();
 
     public:
         CTfLiteClass();
@@ -74,6 +54,4 @@ class CTfLiteClass
         int ReadInputDimenstion(int _dim);
 };
 
-void MakeStaticResolver();
-
 #endif //CTFLITECLASS_H
\ No newline at end of file