libtf: Cleanup ops and split into two sizes.

openmv · Jan 23, 2024 · 5492672 · 5492672
1 parent db7af01
commit 5492672
Show file tree

Hide file tree

Showing 7 changed files with 228 additions and 42 deletions.
diff --git a/libtf.cc b/libtf.cc
@@ -11,8 +11,7 @@
 #include "tensorflow/lite/micro/micro_interpreter.h"
 
 #include "libtf.h"
-
-#define LIBTF_MAX_OPS 72
+#define LIBTF_MAX_OPS 80
 
 extern "C" {
     // These are set by openmv py_tf.c code to redirect printing to an error message buffer...
@@ -62,16 +61,108 @@ extern "C" {
         }
     }
 
-    static void libtf_init_op_resolver(tflite::MicroMutableOpResolver<LIBTF_MAX_OPS> &resolver) {
+    typedef void (*libtf_resolver_init_t) (tflite::MicroMutableOpResolver<LIBTF_MAX_OPS> &);
+
+    static void libtf_reduced_ops_init_op_resolver(tflite::MicroMutableOpResolver<LIBTF_MAX_OPS> &resolver) {
+        // resolver.AddAbs();
+        resolver.AddAdd();
+        resolver.AddAddN();
+        // resolver.AddArgMax();
+        // resolver.AddArgMin();
+        resolver.AddAveragePool2D();
+        // resolver.AddBatchMatMul(); - Doesn't compile in OpenMV Cam firmware
+        // resolver.AddBatchToSpaceNd();
+        // resolver.AddCast();
+        // resolver.AddCeil();
+        // resolver.AddCircularBuffer(); - Doesn't compile in OpenMV Cam firmware
+        // resolver.AddComplexAbs();
+        // resolver.AddConcatenation();
+        resolver.AddConv2D();
+        // resolver.AddCos();
+        resolver.AddDepthwiseConv2D();
+        // resolver.AddDequantize();
+        // resolver.AddDetectionPostprocess();
+        // resolver.AddDiv();
+        // resolver.AddElu();
+        // resolver.AddEqual();
+        // resolver.AddEthosU();
+        // resolver.AddExp();
+        // resolver.AddExpandDims();
+        // resolver.AddFloor();
+        resolver.AddFullyConnected();
+        // resolver.AddGather();
+        // resolver.AddGreater();
+        // resolver.AddGreaterEqual();
+        // resolver.AddHardSwish();
+        // resolver.AddImag();
+        // resolver.AddL2Normalization();
+        // resolver.AddL2Pool2D();
+        resolver.AddLeakyRelu();
+        // resolver.AddLess();
+        // resolver.AddLessEqual();
+        // resolver.AddLog();
+        // resolver.AddLogicalAnd();
+        // resolver.AddLogicalNot();
+        // resolver.AddLogicalOr();
+        resolver.AddLogistic();
+        resolver.AddMaxPool2D();
+        // resolver.AddMaximum();
+        resolver.AddMean();
+        // resolver.AddMinimum();
+        // resolver.AddMul();
+        // resolver.AddNeg();
+        // resolver.AddNotEqual();
+        // resolver.AddPack();
+        resolver.AddPad();
+        // resolver.AddPadV2();
+        // resolver.AddPrelu();
+        // resolver.AddQuantize();
+        // resolver.AddReal();
+        // resolver.AddReduceMax();
+        // resolver.AddReduceMin();
+        resolver.AddRelu();
+        resolver.AddRelu6();
+        resolver.AddReshape();
+        // resolver.AddResizeNearestNeighbor();
+        // resolver.AddRfft2D(); - Doesn't compile in OpenMV Cam firmware
+        // resolver.AddRound();
+        // resolver.AddRsqrt();
+        // resolver.AddSelect();
+        // resolver.AddSelectV2();
+        resolver.AddShape();
+        // resolver.AddSin();
+        // resolver.AddSlice(); - Doesn't compile in OpenMV Cam firmware
+        resolver.AddSoftmax();
+        // resolver.AddSpaceToBatchNd();
+        // resolver.AddSplit();
+        // resolver.AddSplitV();
+        // resolver.AddSqrt();
+        // resolver.AddSquare();
+        // resolver.AddSquaredDifference(); - Doesn't compile in OpenMV Cam firmware
+        // resolver.AddSqueeze();
+        // resolver.AddStridedSlice();
+        resolver.AddSub();
+        // resolver.AddSum();
+        // resolver.AddSvdf();
+        resolver.AddTanh();
+        // resolver.AddTranspose(); - Doesn't compile in OpenMV Cam firmware
+        // resolver.AddTransposeConv();
+        // resolver.AddUnpack();
+        // resolver.AddZerosLike();
+    }
+
+    static void libtf_all_ops_init_op_resolver(tflite::MicroMutableOpResolver<LIBTF_MAX_OPS> &resolver) {
         resolver.AddAbs();
         resolver.AddAdd();
         resolver.AddAddN();
         resolver.AddArgMax();
         resolver.AddArgMin();
         resolver.AddAveragePool2D();
-        // resolver.AddBatchMatMul();
+        // resolver.AddBatchMatMul(); - Doesn't compile in OpenMV Cam firmware
         resolver.AddBatchToSpaceNd();
+        resolver.AddCast();
         resolver.AddCeil();
+        // resolver.AddCircularBuffer(); - Doesn't compile in OpenMV Cam firmware
         resolver.AddComplexAbs();
         resolver.AddConcatenation();
         resolver.AddConv2D();
@@ -121,35 +212,37 @@ extern "C" {
         resolver.AddRelu6();
         resolver.AddReshape();
         resolver.AddResizeNearestNeighbor();
-        // resolver.AddRfft2D();
+        // resolver.AddRfft2D(); - Doesn't compile in OpenMV Cam firmware
         resolver.AddRound();
         resolver.AddRsqrt();
         // resolver.AddSelect();
         // resolver.AddSelectV2();
         resolver.AddShape();
         resolver.AddSin();
-        // resolver.AddSlice();
+        // resolver.AddSlice(); - Doesn't compile in OpenMV Cam firmware
         resolver.AddSoftmax();
         resolver.AddSpaceToBatchNd();
         resolver.AddSplit();
         resolver.AddSplitV();
         resolver.AddSqrt();
         resolver.AddSquare();
-        // resolver.AddSquaredDifference();
+        // resolver.AddSquaredDifference(); - Doesn't compile in OpenMV Cam firmware
         resolver.AddSqueeze();
         resolver.AddStridedSlice();
         resolver.AddSub();
         resolver.AddSum();
         resolver.AddSvdf();
         resolver.AddTanh();
-        // resolver.AddTranspose();
+        // resolver.AddTranspose(); - Doesn't compile in OpenMV Cam firmware
         resolver.AddTransposeConv();
         resolver.AddUnpack();
+        resolver.AddZerosLike();
     }
 
-    int libtf_get_parameters(const unsigned char *model_data,
-                             unsigned char *tensor_arena, size_t tensor_arena_size,
-                             libtf_parameters_t *params) {
+    static int libtf_get_parameters(const unsigned char *model_data,
+                                    unsigned char *tensor_arena, size_t tensor_arena_size,
+                                    libtf_parameters_t *params,
+                                    libtf_resolver_init_t libtf_resolver_init) {
         RegisterDebugLogCallback(libtf_debug_log);
 
         tflite::MicroErrorReporter micro_error_reporter;
@@ -168,7 +261,7 @@ extern "C" {
         }
 
         tflite::MicroMutableOpResolver<LIBTF_MAX_OPS> resolver;
-        libtf_init_op_resolver(resolver);
+        libtf_resolver_init(resolver);
 
         tflite::MicroInterpreter interpreter(model, resolver, tensor_arena, tensor_arena_size, error_reporter);
 
@@ -287,13 +380,36 @@ extern "C" {
         return 0;
     }
 
-    int libtf_invoke(const unsigned char *model_data,
-                     unsigned char *tensor_arena,
-                     libtf_parameters_t *params,
-                     libtf_input_data_callback_t input_callback,
-                     void *input_callback_data,
-                     libtf_output_data_callback_t output_callback,
-                     void *output_callback_data) {
+    int libtf_reduced_ops_get_parameters(const unsigned char *model_data,
+                                         unsigned char *tensor_arena,
+                                         size_t tensor_arena_size,
+                                         libtf_parameters_t *params) {
+        return libtf_get_parameters(model_data,
+                                    tensor_arena,
+                                    tensor_arena_size,
+                                    params,
+                                    libtf_reduced_ops_init_op_resolver);
+    }
+
+    int libtf_all_ops_get_parameters(const unsigned char *model_data,
+                                     unsigned char *tensor_arena,
+                                     size_t tensor_arena_size,
+                                     libtf_parameters_t *params) {
+        return libtf_get_parameters(model_data,
+                                    tensor_arena,
+                                    tensor_arena_size,
+                                    params,
+                                    libtf_all_ops_init_op_resolver);
+    }
+
+    static int libtf_invoke(const unsigned char *model_data,
+                            unsigned char *tensor_arena,
+                            libtf_parameters_t *params,
+                            libtf_input_data_callback_t input_callback,
+                            void *input_callback_data,
+                            libtf_output_data_callback_t output_callback,
+                            void *output_callback_data,
+                            libtf_resolver_init_t libtf_resolver_init) {
         RegisterDebugLogCallback(libtf_debug_log);
 
         tflite::MicroErrorReporter micro_error_reporter;
@@ -314,7 +430,7 @@ extern "C" {
         }
 
         tflite::MicroMutableOpResolver<LIBTF_MAX_OPS> resolver;
-        libtf_init_op_resolver(resolver);
+        libtf_resolver_init(resolver);
 
         tflite::MicroInterpreter interpreter(model, resolver, tensor_arena, tensor_arena_size, error_reporter);
 
@@ -335,6 +451,40 @@ extern "C" {
         return 0;
     }
 
+    int libtf_reduced_ops_invoke(const unsigned char *model_data,
+                                 unsigned char *tensor_arena,
+                                 libtf_parameters_t *params,
+                                 libtf_input_data_callback_t input_callback,
+                                 void *input_callback_data,
+                                 libtf_output_data_callback_t output_callback,
+                                 void *output_callback_data) {
+        return libtf_invoke(model_data,
+                            tensor_arena,
+                            params,
+                            input_callback,
+                            input_callback_data,
+                            output_callback,
+                            output_callback_data,
+                            libtf_reduced_ops_init_op_resolver);
+    }
+
+    int libtf_all_ops_invoke(const unsigned char *model_data,
+                             unsigned char *tensor_arena,
+                             libtf_parameters_t *params,
+                             libtf_input_data_callback_t input_callback,
+                             void *input_callback_data,
+                             libtf_output_data_callback_t output_callback,
+                             void *output_callback_data) {
+        return libtf_invoke(model_data,
+                            tensor_arena,
+                            params,
+                            input_callback,
+                            input_callback_data,
+                            output_callback,
+                            output_callback_data,
+                            libtf_all_ops_init_op_resolver);
+    }
+
     int libtf_initialize_micro_features() {
         RegisterDebugLogCallback(libtf_debug_log);
 

diff --git a/libtf.h b/libtf.h
@@ -33,10 +33,18 @@ typedef struct libtf_parameters {
 // Call this first to get the model parameters.
 // Returns 0 on success and 1 on failure.
 // Errors are printed to stdout.
-int libtf_get_parameters(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
-                         unsigned char *tensor_arena, // As big as you can make it scratch buffer.
-                         size_t tensor_arena_size, // Size of the above scratch buffer.
-                         libtf_parameters_t *params); // Struct to hold model parameters.
+int libtf_reduced_ops_get_parameters(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                                     unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                                     size_t tensor_arena_size, // Size of the above scratch buffer.
+                                     libtf_parameters_t *params); // Struct to hold model parameters.
+
+// Call this first to get the model parameters.
+// Returns 0 on success and 1 on failure.
+// Errors are printed to stdout.
+int libtf_all_ops_get_parameters(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                                 unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                                 size_t tensor_arena_size, // Size of the above scratch buffer.
+                                 libtf_parameters_t *params); // Struct to hold model parameters.
 
 // Callback to populate the model input data byte array (laid out in [height][width][channel] order).
 typedef void (*libtf_input_data_callback_t)(void *callback_data,
@@ -50,13 +58,23 @@ typedef void (*libtf_output_data_callback_t)(void *callback_data,
 
 // Returns 0 on success and 1 on failure.
 // Errors are printed to stdout.
-int libtf_invoke(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
-                 unsigned char *tensor_arena, // As big as you can make it scratch buffer.
-                 libtf_parameters_t *params, // Struct with model parameters.
-                 libtf_input_data_callback_t input_callback, // Callback to populate the model input data byte array.
-                 void *input_callback_data, // User data structure passed to input callback.
-                 libtf_output_data_callback_t output_callback, // Callback to use the model output data byte array.
-                 void *output_callback_data); // User data structure passed to output callback.
+int libtf_reduced_ops_invoke(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                             unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                             libtf_parameters_t *params, // Struct with model parameters.
+                             libtf_input_data_callback_t input_callback, // Callback to populate the model input data byte array.
+                             void *input_callback_data, // User data structure passed to input callback.
+                             libtf_output_data_callback_t output_callback, // Callback to use the model output data byte array.
+                             void *output_callback_data); // User data structure passed to output callback.
+
+// Returns 0 on success and 1 on failure.
+// Errors are printed to stdout.
+int libtf_all_ops_invoke(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                         unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                         libtf_parameters_t *params, // Struct with model parameters.
+                         libtf_input_data_callback_t input_callback, // Callback to populate the model input data byte array.
+                         void *input_callback_data, // User data structure passed to input callback.
+                         libtf_output_data_callback_t output_callback, // Callback to use the model output data byte array.
+                         void *output_callback_data); // User data structure passed to output callback.
 
 // Returns 0 on success and 1 on failure.
 // Errors are printed to stdout.

diff --git a/libtf/cortex-m0plus/libtf.a b/libtf/cortex-m0plus/libtf.a
diff --git a/libtf/cortex-m4/libtf.a b/libtf/cortex-m4/libtf.a
diff --git a/libtf/cortex-m55/libtf.a b/libtf/cortex-m55/libtf.a
diff --git a/libtf/cortex-m7/libtf.a b/libtf/cortex-m7/libtf.a
diff --git a/libtf/libtf.h b/libtf/libtf.h
@@ -33,10 +33,18 @@ typedef struct libtf_parameters {
 // Call this first to get the model parameters.
 // Returns 0 on success and 1 on failure.
 // Errors are printed to stdout.
-int libtf_get_parameters(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
-                         unsigned char *tensor_arena, // As big as you can make it scratch buffer.
-                         size_t tensor_arena_size, // Size of the above scratch buffer.
-                         libtf_parameters_t *params); // Struct to hold model parameters.
+int libtf_reduced_ops_get_parameters(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                                     unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                                     size_t tensor_arena_size, // Size of the above scratch buffer.
+                                     libtf_parameters_t *params); // Struct to hold model parameters.
+
+// Call this first to get the model parameters.
+// Returns 0 on success and 1 on failure.
+// Errors are printed to stdout.
+int libtf_all_ops_get_parameters(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                                 unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                                 size_t tensor_arena_size, // Size of the above scratch buffer.
+                                 libtf_parameters_t *params); // Struct to hold model parameters.
 
 // Callback to populate the model input data byte array (laid out in [height][width][channel] order).
 typedef void (*libtf_input_data_callback_t)(void *callback_data,
@@ -50,13 +58,23 @@ typedef void (*libtf_output_data_callback_t)(void *callback_data,
 
 // Returns 0 on success and 1 on failure.
 // Errors are printed to stdout.
-int libtf_invoke(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
-                 unsigned char *tensor_arena, // As big as you can make it scratch buffer.
-                 libtf_parameters_t *params, // Struct with model parameters.
-                 libtf_input_data_callback_t input_callback, // Callback to populate the model input data byte array.
-                 void *input_callback_data, // User data structure passed to input callback.
-                 libtf_output_data_callback_t output_callback, // Callback to use the model output data byte array.
-                 void *output_callback_data); // User data structure passed to output callback.
+int libtf_reduced_ops_invoke(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                             unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                             libtf_parameters_t *params, // Struct with model parameters.
+                             libtf_input_data_callback_t input_callback, // Callback to populate the model input data byte array.
+                             void *input_callback_data, // User data structure passed to input callback.
+                             libtf_output_data_callback_t output_callback, // Callback to use the model output data byte array.
+                             void *output_callback_data); // User data structure passed to output callback.
+
+// Returns 0 on success and 1 on failure.
+// Errors are printed to stdout.
+int libtf_all_ops_invoke(const unsigned char *model_data, // TensorFlow Lite binary model (8-bit quant).
+                         unsigned char *tensor_arena, // As big as you can make it scratch buffer.
+                         libtf_parameters_t *params, // Struct with model parameters.
+                         libtf_input_data_callback_t input_callback, // Callback to populate the model input data byte array.
+                         void *input_callback_data, // User data structure passed to input callback.
+                         libtf_output_data_callback_t output_callback, // Callback to use the model output data byte array.
+                         void *output_callback_data); // User data structure passed to output callback.
 
 // Returns 0 on success and 1 on failure.
 // Errors are printed to stdout.