michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: tflite-micro: update samples for latest tflite-micro

Browse source 
tflite-micro now uses MicroPrintf instead of MicroErrorReporter. Update
the samples to use this function instead. AllOpsResolver is now removed
from tflite-micro. AllOpsResolver was also removed in the latest
tflite-micro. Use MicroMutableOpResolver and only include the kernels
used instead.

Signed-off-by: Ryan McClelland <ryanmcclelland@meta.com>
This commit is contained in:
Ryan McClelland 2023-04-18 11:35:10 -07:00 • committed by Carles Cufí
commit 65a15e9299
12 changed files with 54 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/modules/tflite-micro/hello_world/prj.conf
View file

@ -13,5 +13,6 @@
# limitations under the License. # limitations under the License.
# ==============================================================================s # ==============================================================================s
CONFIG_CPP=y CONFIG_CPP=y
CONFIG_STD_CPP17=y
CONFIG_TENSORFLOW_LITE_MICRO=y CONFIG_TENSORFLOW_LITE_MICRO=y
CONFIG_MAIN_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048

34
samples/modules/tflite-micro/hello_world/src/main_functions.cpp
View file

@ -16,18 +16,17 @@
#include "main_functions.h" #include "main_functions.h"
#include <tensorflow/lite/micro/all_ops_resolver.h> #include <tensorflow/lite/micro/micro_mutable_op_resolver.h>
#include "constants.h" #include "constants.h"
#include "model.hpp" #include "model.hpp"
#include "output_handler.hpp" #include "output_handler.hpp"
#include <tensorflow/lite/micro/micro_error_reporter.h> #include <tensorflow/lite/micro/micro_log.h>
#include <tensorflow/lite/micro/micro_interpreter.h> #include <tensorflow/lite/micro/micro_interpreter.h>
#include <tensorflow/lite/micro/system_setup.h> #include <tensorflow/lite/micro/system_setup.h>
#include <tensorflow/lite/schema/schema_generated.h> #include <tensorflow/lite/schema/schema_generated.h>
/* Globals, used for compatibility with Arduino-style sketches. */ /* Globals, used for compatibility with Arduino-style sketches. */
namespace { namespace {
tflite::ErrorReporter *error_reporter = nullptr;
const tflite::Model *model = nullptr; const tflite::Model *model = nullptr;
tflite::MicroInterpreter *interpreter = nullptr; tflite::MicroInterpreter *interpreter = nullptr;
TfLiteTensor *input = nullptr; TfLiteTensor *input = nullptr;
@ -41,40 +40,32 @@ namespace {
/* The name of this function is important for Arduino compatibility. */ /* The name of this function is important for Arduino compatibility. */
void setup(void) void setup(void)
{ {
/* Set up logging. Google style is to avoid globals or statics because of
* lifetime uncertainty, but since this has a trivial destructor it's okay.
* NOLINTNEXTLINE(runtime-global-variables)
*/
static tflite::MicroErrorReporter micro_error_reporter;
error_reporter = &micro_error_reporter;
/* Map the model into a usable data structure. This doesn't involve any /* Map the model into a usable data structure. This doesn't involve any
* copying or parsing, it's a very lightweight operation. * copying or parsing, it's a very lightweight operation.
*/ */
model = tflite::GetModel(g_model); model = tflite::GetModel(g_model);
if (model->version() != TFLITE_SCHEMA_VERSION) { if (model->version() != TFLITE_SCHEMA_VERSION) {
TF_LITE_REPORT_ERROR(error_reporter, MicroPrintf("Model provided is schema version %d not equal "
"Model provided is schema version %d not equal " "to supported version %d.",
"to supported version %d.", model->version(), TFLITE_SCHEMA_VERSION);
model->version(), TFLITE_SCHEMA_VERSION);
return; return;
} }
/* This pulls in all the operation implementations we need. /* This pulls in the operation implementations we need.
* NOLINTNEXTLINE(runtime-global-variables) * NOLINTNEXTLINE(runtime-global-variables)
*/ */
static tflite::AllOpsResolver resolver; static tflite::MicroMutableOpResolver <1> resolver;
resolver.AddFullyConnected();
/* Build an interpreter to run the model with. */ /* Build an interpreter to run the model with. */
static tflite::MicroInterpreter static_interpreter( static tflite::MicroInterpreter static_interpreter(
model, resolver, tensor_arena, kTensorArenaSize, error_reporter); model, resolver, tensor_arena, kTensorArenaSize);
interpreter = &static_interpreter; interpreter = &static_interpreter;
/* Allocate memory from the tensor_arena for the model's tensors. */ /* Allocate memory from the tensor_arena for the model's tensors. */
TfLiteStatus allocate_status = interpreter->AllocateTensors(); TfLiteStatus allocate_status = interpreter->AllocateTensors();
if (allocate_status != kTfLiteOk) { if (allocate_status != kTfLiteOk) {
TF_LITE_REPORT_ERROR(error_reporter, "AllocateTensors() failed"); MicroPrintf("AllocateTensors() failed");
return; return;
} }
@ -106,8 +97,7 @@ void loop(void)
/* Run inference, and report any error */ /* Run inference, and report any error */
TfLiteStatus invoke_status = interpreter->Invoke(); TfLiteStatus invoke_status = interpreter->Invoke();
if (invoke_status != kTfLiteOk) { if (invoke_status != kTfLiteOk) {
TF_LITE_REPORT_ERROR(error_reporter, "Invoke failed on x: %f\n", MicroPrintf("Invoke failed on x: %f\n", static_cast < double > (x));
static_cast < double > (x));
return; return;
} }
@ -119,7 +109,7 @@ void loop(void)
/* Output the results. A custom HandleOutput function can be implemented /* Output the results. A custom HandleOutput function can be implemented
* for each supported hardware target. * for each supported hardware target.
*/ */
HandleOutput(error_reporter, x, y); HandleOutput(x, y);
/* Increment the inference_counter, and reset it if we have reached /* Increment the inference_counter, and reset it if we have reached
* the total number per cycle * the total number per cycle

9
samples/modules/tflite-micro/hello_world/src/output_handler.cpp
View file

@ -16,11 +16,10 @@
#include "output_handler.hpp" #include "output_handler.hpp"
void HandleOutput(tflite::ErrorReporter *error_reporter, float x_value, void HandleOutput(float x_value, float y_value)
float y_value)
{ {
/* Log the current X and Y values */ /* Log the current X and Y values */
TF_LITE_REPORT_ERROR(error_reporter, "x_value: %f, y_value: %f\n", MicroPrintf("x_value: %f, y_value: %f\n",
static_cast < double > (x_value), static_cast < double > (x_value),
static_cast < double > (y_value)); static_cast < double > (y_value));
} }

5
samples/modules/tflite-micro/hello_world/src/output_handler.hpp
View file

@ -18,10 +18,9 @@
#define TENSORFLOW_LITE_MICRO_EXAMPLES_HELLO_WORLD_OUTPUT_HANDLER_H_ #define TENSORFLOW_LITE_MICRO_EXAMPLES_HELLO_WORLD_OUTPUT_HANDLER_H_
#include <tensorflow/lite/c/common.h> #include <tensorflow/lite/c/common.h>
#include <tensorflow/lite/micro/micro_error_reporter.h> #include <tensorflow/lite/micro/micro_log.h>
/* Called by the main loop to produce some output based on the x and y values */ /* Called by the main loop to produce some output based on the x and y values */
void HandleOutput(tflite::ErrorReporter *error_reporter, float x_value, void HandleOutput(float x_value, float y_value);
float y_value);
#endif /* TENSORFLOW_LITE_MICRO_EXAMPLES_HELLO_WORLD_OUTPUT_HANDLER_H_ */ #endif /* TENSORFLOW_LITE_MICRO_EXAMPLES_HELLO_WORLD_OUTPUT_HANDLER_H_ */

1
samples/modules/tflite-micro/magic_wand/prj.conf
View file

@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
# ============================================================================== # ==============================================================================
CONFIG_CPP=y CONFIG_CPP=y
CONFIG_STD_CPP17=y
CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
CONFIG_SENSOR=y CONFIG_SENSOR=y
CONFIG_NETWORKING=n CONFIG_NETWORKING=n

18
samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp
View file

@ -33,7 +33,7 @@ float bufz[BUFLEN] = { 0.0f };
bool initial = true; bool initial = true;
TfLiteStatus SetupAccelerometer(tflite::ErrorReporter *error_reporter) TfLiteStatus SetupAccelerometer()
{ {
if (!device_is_ready(sensor)) { if (!device_is_ready(sensor)) {
printk("%s: device not ready.\n", sensor->name); printk("%s: device not ready.\n", sensor->name);
@ -41,18 +41,16 @@ TfLiteStatus SetupAccelerometer(tflite::ErrorReporter *error_reporter)
} }
if (sensor == NULL) { if (sensor == NULL) {
TF_LITE_REPORT_ERROR(error_reporter, MicroPrintf("Failed to get accelerometer, name: %s\n",
"Failed to get accelerometer, name: %s\n", sensor->name);
sensor->name);
} else { } else {
TF_LITE_REPORT_ERROR(error_reporter, "Got accelerometer, name: %s\n", MicroPrintf("Got accelerometer, name: %s\n",
sensor->name); sensor->name);
} }
return kTfLiteOk; return kTfLiteOk;
} }
bool ReadAccelerometer(tflite::ErrorReporter *error_reporter, float *input, bool ReadAccelerometer(float *input, int length)
int length)
{ {
int rc; int rc;
struct sensor_value accel[3]; struct sensor_value accel[3];
@ -60,7 +58,7 @@ bool ReadAccelerometer(tflite::ErrorReporter *error_reporter, float *input,
rc = sensor_sample_fetch(sensor); rc = sensor_sample_fetch(sensor);
if (rc < 0) { if (rc < 0) {
TF_LITE_REPORT_ERROR(error_reporter, "Fetch failed\n"); MicroPrintf("Fetch failed\n");
return false; return false;
} }
/* Skip if there is no data */ /* Skip if there is no data */
@ -72,7 +70,7 @@ bool ReadAccelerometer(tflite::ErrorReporter *error_reporter, float *input,
for (int i = 0; i < samples_count; i++) { for (int i = 0; i < samples_count; i++) {
rc = sensor_channel_get(sensor, SENSOR_CHAN_ACCEL_XYZ, accel); rc = sensor_channel_get(sensor, SENSOR_CHAN_ACCEL_XYZ, accel);
if (rc < 0) { if (rc < 0) {
TF_LITE_REPORT_ERROR(error_reporter, "ERROR: Update failed: %d\n", rc); MicroPrintf("ERROR: Update failed: %d\n", rc);
return false; return false;
} }
bufx[begin_index] = (float)sensor_value_to_double(&accel[0]); bufx[begin_index] = (float)sensor_value_to_double(&accel[0]);

7
samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.hpp
View file

@ -20,11 +20,10 @@
#define kChannelNumber 3 #define kChannelNumber 3
#include <tensorflow/lite/c/c_api_types.h> #include <tensorflow/lite/c/c_api_types.h>
#include <tensorflow/lite/micro/micro_error_reporter.h> #include <tensorflow/lite/micro/micro_log.h>
extern int begin_index; extern int begin_index;
extern TfLiteStatus SetupAccelerometer(tflite::ErrorReporter *error_reporter); extern TfLiteStatus SetupAccelerometer();
extern bool ReadAccelerometer(tflite::ErrorReporter *error_reporter, extern bool ReadAccelerometer(float *input, int length);
float *input, int length);
#endif /* TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_ACCELEROMETER_HANDLER_H_ */ #endif /* TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_ACCELEROMETER_HANDLER_H_ */

33
samples/modules/tflite-micro/magic_wand/src/main_functions.cpp
View file

@ -21,14 +21,13 @@
#include "gesture_predictor.hpp" #include "gesture_predictor.hpp"
#include "magic_wand_model_data.hpp" #include "magic_wand_model_data.hpp"
#include "output_handler.hpp" #include "output_handler.hpp"
#include <tensorflow/lite/micro/micro_error_reporter.h> #include <tensorflow/lite/micro/micro_log.h>
#include <tensorflow/lite/micro/micro_interpreter.h> #include <tensorflow/lite/micro/micro_interpreter.h>
#include <tensorflow/lite/micro/micro_mutable_op_resolver.h> #include <tensorflow/lite/micro/micro_mutable_op_resolver.h>
#include <tensorflow/lite/schema/schema_generated.h> #include <tensorflow/lite/schema/schema_generated.h>
/* Globals, used for compatibility with Arduino-style sketches. */ /* Globals, used for compatibility with Arduino-style sketches. */
namespace { namespace {
tflite::ErrorReporter *error_reporter = nullptr;
const tflite::Model *model = nullptr; const tflite::Model *model = nullptr;
tflite::MicroInterpreter *interpreter = nullptr; tflite::MicroInterpreter *interpreter = nullptr;
TfLiteTensor *model_input = nullptr; TfLiteTensor *model_input = nullptr;
@ -45,22 +44,14 @@ namespace {
/* The name of this function is important for Arduino compatibility. */ /* The name of this function is important for Arduino compatibility. */
void setup(void) void setup(void)
{ {
/* Set up logging. Google style is to avoid globals or statics because of
* lifetime uncertainty, but since this has a trivial destructor it's okay.
*/
static tflite::MicroErrorReporter micro_error_reporter; /* NOLINT */
error_reporter = &micro_error_reporter;
/* Map the model into a usable data structure. This doesn't involve any /* Map the model into a usable data structure. This doesn't involve any
* copying or parsing, it's a very lightweight operation. * copying or parsing, it's a very lightweight operation.
*/ */
model = tflite::GetModel(g_magic_wand_model_data); model = tflite::GetModel(g_magic_wand_model_data);
if (model->version() != TFLITE_SCHEMA_VERSION) { if (model->version() != TFLITE_SCHEMA_VERSION) {
TF_LITE_REPORT_ERROR(error_reporter, MicroPrintf("Model provided is schema version %d not equal "
"Model provided is schema version %d not equal " "to supported version %d.",
"to supported version %d.", model->version(), TFLITE_SCHEMA_VERSION);
model->version(), TFLITE_SCHEMA_VERSION);
return; return;
} }
@ -79,7 +70,7 @@ void setup(void)
/* Build an interpreter to run the model with. */ /* Build an interpreter to run the model with. */
static tflite::MicroInterpreter static_interpreter( static tflite::MicroInterpreter static_interpreter(
model, micro_op_resolver, tensor_arena, kTensorArenaSize, error_reporter); model, micro_op_resolver, tensor_arena, kTensorArenaSize);
interpreter = &static_interpreter; interpreter = &static_interpreter;
/* Allocate memory from the tensor_arena for the model's tensors. */ /* Allocate memory from the tensor_arena for the model's tensors. */
@ -91,16 +82,15 @@ void setup(void)
(model_input->dims->data[1] != 128) || (model_input->dims->data[1] != 128) ||
(model_input->dims->data[2] != kChannelNumber) || (model_input->dims->data[2] != kChannelNumber) ||
(model_input->type != kTfLiteFloat32)) { (model_input->type != kTfLiteFloat32)) {
TF_LITE_REPORT_ERROR(error_reporter, MicroPrintf("Bad input tensor parameters in model");
"Bad input tensor parameters in model");
return; return;
} }
input_length = model_input->bytes / sizeof(float); input_length = model_input->bytes / sizeof(float);
TfLiteStatus setup_status = SetupAccelerometer(error_reporter); TfLiteStatus setup_status = SetupAccelerometer();
if (setup_status != kTfLiteOk) { if (setup_status != kTfLiteOk) {
TF_LITE_REPORT_ERROR(error_reporter, "Set up failed\n"); MicroPrintf("Set up failed\n");
} }
} }
@ -108,7 +98,7 @@ void loop(void)
{ {
/* Attempt to read new data from the accelerometer. */ /* Attempt to read new data from the accelerometer. */
bool got_data = bool got_data =
ReadAccelerometer(error_reporter, model_input->data.f, input_length); ReadAccelerometer(model_input->data.f, input_length);
/* If there was no new data, wait until next time. */ /* If there was no new data, wait until next time. */
if (!got_data) { if (!got_data) {
@ -118,13 +108,12 @@ void loop(void)
/* Run inference, and report any error */ /* Run inference, and report any error */
TfLiteStatus invoke_status = interpreter->Invoke(); TfLiteStatus invoke_status = interpreter->Invoke();
if (invoke_status != kTfLiteOk) { if (invoke_status != kTfLiteOk) {
TF_LITE_REPORT_ERROR(error_reporter, "Invoke failed on index: %d\n", MicroPrintf("Invoke failed on index: %d\n", begin_index);
begin_index);
return; return;
} }
/* Analyze the results to obtain a prediction */ /* Analyze the results to obtain a prediction */
int gesture_index = PredictGesture(interpreter->output(0)->data.f); int gesture_index = PredictGesture(interpreter->output(0)->data.f);
/* Produce an output */ /* Produce an output */
HandleOutput(error_reporter, gesture_index); HandleOutput(gesture_index);
} }

11
samples/modules/tflite-micro/magic_wand/src/output_handler.cpp
View file

@ -16,24 +16,21 @@
#include "output_handler.hpp" #include "output_handler.hpp"
void HandleOutput(tflite::ErrorReporter *error_reporter, int kind) void HandleOutput(int kind)
{ {
/* light (red: wing, blue: ring, green: slope) */ /* light (red: wing, blue: ring, green: slope) */
if (kind == 0) { if (kind == 0) {
TF_LITE_REPORT_ERROR( MicroPrintf(
error_reporter,
"WING:\n\r* * *\n\r * * * " "WING:\n\r* * *\n\r * * * "
"*\n\r * * * *\n\r * * * *\n\r * * " "*\n\r * * * *\n\r * * * *\n\r * * "
"* *\n\r * *\n\r"); "* *\n\r * *\n\r");
} else if (kind == 1) { } else if (kind == 1) {
TF_LITE_REPORT_ERROR( MicroPrintf(
error_reporter,
"RING:\n\r *\n\r * *\n\r * *\n\r " "RING:\n\r *\n\r * *\n\r * *\n\r "
" * *\n\r * *\n\r * *\n\r " " * *\n\r * *\n\r * *\n\r "
" *\n\r"); " *\n\r");
} else if (kind == 2) { } else if (kind == 2) {
TF_LITE_REPORT_ERROR( MicroPrintf(
error_reporter,
"SLOPE:\n\r *\n\r *\n\r *\n\r *\n\r " "SLOPE:\n\r *\n\r *\n\r *\n\r *\n\r "
"*\n\r *\n\r *\n\r * * * * * * * *\n\r"); "*\n\r *\n\r *\n\r * * * * * * * *\n\r");
} }

4
samples/modules/tflite-micro/magic_wand/src/output_handler.hpp
View file

@ -18,8 +18,8 @@
#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_ #define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_
#include <tensorflow/lite/c/common.h> #include <tensorflow/lite/c/common.h>
#include <tensorflow/lite/micro/micro_error_reporter.h> #include <tensorflow/lite/micro/micro_log.h>
void HandleOutput(tflite::ErrorReporter *error_reporter, int kind); void HandleOutput(int kind);
#endif /* TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_ */ #endif /* TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_ */

1
samples/modules/tflite-micro/tflm_ethosu/prj.conf
View file

@ -1,6 +1,7 @@
#application default configuration #application default configuration
# include TFLM based on CMSIS NN optimization and ETHOSU acceleration # include TFLM based on CMSIS NN optimization and ETHOSU acceleration
CONFIG_CPP=y CONFIG_CPP=y
CONFIG_STD_CPP17=y
CONFIG_TENSORFLOW_LITE_MICRO=y CONFIG_TENSORFLOW_LITE_MICRO=y
CONFIG_ARM_ETHOS_U=y CONFIG_ARM_ETHOS_U=y
CONFIG_HEAP_MEM_POOL_SIZE=16384 CONFIG_HEAP_MEM_POOL_SIZE=16384

11
samples/modules/tflite-micro/tflm_ethosu/src/inference_process.cpp
View file

@ -6,9 +6,9 @@
#include "inference_process.hpp" #include "inference_process.hpp"
#include <tensorflow/lite/micro/all_ops_resolver.h> #include <tensorflow/lite/micro/micro_mutable_op_resolver.h>
#include <tensorflow/lite/micro/cortex_m_generic/debug_log_callback.h> #include <tensorflow/lite/micro/cortex_m_generic/debug_log_callback.h>
#include <tensorflow/lite/micro/micro_error_reporter.h> #include <tensorflow/lite/micro/micro_log.h>
#include <tensorflow/lite/micro/micro_interpreter.h> #include <tensorflow/lite/micro/micro_interpreter.h>
#include <tensorflow/lite/micro/micro_profiler.h> #include <tensorflow/lite/micro/micro_profiler.h>
#include <tensorflow/lite/schema/schema_generated.h> #include <tensorflow/lite/schema/schema_generated.h>
@ -118,11 +118,10 @@ bool InferenceProcess::runJob(InferenceJob &job)
} }
/* Create the TFL micro interpreter */ /* Create the TFL micro interpreter */
tflite::AllOpsResolver resolver; tflite::MicroMutableOpResolver <1> resolver;
tflite::MicroErrorReporter errorReporter; resolver.AddEthosU();
tflite::MicroInterpreter interpreter(model, resolver, tensorArena, tensorArenaSize, tflite::MicroInterpreter interpreter(model, resolver, tensorArena, tensorArenaSize);
&errorReporter);
/* Allocate tensors */ /* Allocate tensors */
TfLiteStatus allocate_status = interpreter.AllocateTensors(); TfLiteStatus allocate_status = interpreter.AllocateTensors();