From 13cc273318d691acc83f73aed151fc3634821af8 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 23 Jun 2024 17:37:58 +0200 Subject: [PATCH] boards/all: Enable built-in TFLM models. The new built-in model system allows fine-grained control over which models get built into the firmware image. This patch enables FOMO for all boards and audio processing models for boards with mics. --- src/omv/boards/ARDUINO_GIGA/imlib_config.h | 10 ++++------ .../boards/ARDUINO_NANO_33_BLE_SENSE/imlib_config.h | 7 +------ .../boards/ARDUINO_NANO_RP2040_CONNECT/imlib_config.h | 7 +------ src/omv/boards/ARDUINO_NICLA_VISION/imlib_config.h | 10 ++++------ src/omv/boards/ARDUINO_PORTENTA_H7/imlib_config.h | 10 ++++------ src/omv/boards/OPENMV1/imlib_config.h | 2 +- src/omv/boards/OPENMV2/imlib_config.h | 2 +- src/omv/boards/OPENMV3/imlib_config.h | 8 ++------ src/omv/boards/OPENMV4/imlib_config.h | 8 ++------ src/omv/boards/OPENMV4P/imlib_config.h | 8 ++------ src/omv/boards/OPENMV4_PRO/imlib_config.h | 8 ++------ src/omv/boards/OPENMVPT/imlib_config.h | 8 ++------ src/omv/boards/OPENMV_RT1060/imlib_config.h | 11 ++++------- src/omv/boards/PICO/imlib_config.h | 7 +------ 14 files changed, 31 insertions(+), 75 deletions(-) diff --git a/src/omv/boards/ARDUINO_GIGA/imlib_config.h b/src/omv/boards/ARDUINO_GIGA/imlib_config.h index 23f2bd58c..11a0801c7 100644 --- a/src/omv/boards/ARDUINO_GIGA/imlib_config.h +++ b/src/omv/boards/ARDUINO_GIGA/imlib_config.h @@ -114,14 +114,12 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_MICRO_SPEECH +#define IMLIB_ENABLE_TFLM_BUILTIN_AUDIO_PREPROCESSOR +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/imlib_config.h b/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/imlib_config.h index 29a5d3b74..f4d597582 100644 --- a/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/imlib_config.h +++ b/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/imlib_config.h @@ -115,14 +115,9 @@ //#define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE //#define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -//#define IMLIB_ENABLE_TF +//#define IMLIB_ENABLE_TFLM #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/ARDUINO_NANO_RP2040_CONNECT/imlib_config.h b/src/omv/boards/ARDUINO_NANO_RP2040_CONNECT/imlib_config.h index 3d1f372a4..555a4e7b6 100644 --- a/src/omv/boards/ARDUINO_NANO_RP2040_CONNECT/imlib_config.h +++ b/src/omv/boards/ARDUINO_NANO_RP2040_CONNECT/imlib_config.h @@ -114,14 +114,9 @@ //#define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE //#define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -//#define IMLIB_ENABLE_TF +//#define IMLIB_ENABLE_TFLM #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/ARDUINO_NICLA_VISION/imlib_config.h b/src/omv/boards/ARDUINO_NICLA_VISION/imlib_config.h index dd87caf6e..19efd161a 100644 --- a/src/omv/boards/ARDUINO_NICLA_VISION/imlib_config.h +++ b/src/omv/boards/ARDUINO_NICLA_VISION/imlib_config.h @@ -114,14 +114,12 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_MICRO_SPEECH +#define IMLIB_ENABLE_TFLM_BUILTIN_AUDIO_PREPROCESSOR +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/ARDUINO_PORTENTA_H7/imlib_config.h b/src/omv/boards/ARDUINO_PORTENTA_H7/imlib_config.h index 284fb9bbe..aa3685df8 100644 --- a/src/omv/boards/ARDUINO_PORTENTA_H7/imlib_config.h +++ b/src/omv/boards/ARDUINO_PORTENTA_H7/imlib_config.h @@ -114,14 +114,12 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_MICRO_SPEECH +#define IMLIB_ENABLE_TFLM_BUILTIN_AUDIO_PREPROCESSOR +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/OPENMV1/imlib_config.h b/src/omv/boards/OPENMV1/imlib_config.h index c5aea0021..acf7228f1 100644 --- a/src/omv/boards/OPENMV1/imlib_config.h +++ b/src/omv/boards/OPENMV1/imlib_config.h @@ -73,7 +73,7 @@ //#define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE // Enable Tensor Flow -//#define IMLIB_ENABLE_TF +//#define IMLIB_ENABLE_TFLM // Enable STM32 DMA2D #define IMLIB_ENABLE_DMA2D diff --git a/src/omv/boards/OPENMV2/imlib_config.h b/src/omv/boards/OPENMV2/imlib_config.h index e77006e60..62c5306b9 100644 --- a/src/omv/boards/OPENMV2/imlib_config.h +++ b/src/omv/boards/OPENMV2/imlib_config.h @@ -112,7 +112,7 @@ //#define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE // Enable Tensor Flow -//#define IMLIB_ENABLE_TF +//#define IMLIB_ENABLE_TFLM // Enable FAST (20+ KBs). //#define IMLIB_ENABLE_FAST diff --git a/src/omv/boards/OPENMV3/imlib_config.h b/src/omv/boards/OPENMV3/imlib_config.h index cf1e3b3b0..cb3f96a9e 100644 --- a/src/omv/boards/OPENMV3/imlib_config.h +++ b/src/omv/boards/OPENMV3/imlib_config.h @@ -114,14 +114,10 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/OPENMV4/imlib_config.h b/src/omv/boards/OPENMV4/imlib_config.h index ab97976c0..de1a69f45 100644 --- a/src/omv/boards/OPENMV4/imlib_config.h +++ b/src/omv/boards/OPENMV4/imlib_config.h @@ -114,14 +114,10 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/OPENMV4P/imlib_config.h b/src/omv/boards/OPENMV4P/imlib_config.h index 9c45de94d..8475cfa8b 100644 --- a/src/omv/boards/OPENMV4P/imlib_config.h +++ b/src/omv/boards/OPENMV4P/imlib_config.h @@ -114,14 +114,10 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/OPENMV4_PRO/imlib_config.h b/src/omv/boards/OPENMV4_PRO/imlib_config.h index 9c45de94d..8475cfa8b 100644 --- a/src/omv/boards/OPENMV4_PRO/imlib_config.h +++ b/src/omv/boards/OPENMV4_PRO/imlib_config.h @@ -114,14 +114,10 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/OPENMVPT/imlib_config.h b/src/omv/boards/OPENMVPT/imlib_config.h index 9c45de94d..8475cfa8b 100644 --- a/src/omv/boards/OPENMVPT/imlib_config.h +++ b/src/omv/boards/OPENMVPT/imlib_config.h @@ -114,14 +114,10 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_DEFAULT) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION #endif // Enable FAST (20+ KBs). diff --git a/src/omv/boards/OPENMV_RT1060/imlib_config.h b/src/omv/boards/OPENMV_RT1060/imlib_config.h index 88d1a34c7..eb36be078 100644 --- a/src/omv/boards/OPENMV_RT1060/imlib_config.h +++ b/src/omv/boards/OPENMV_RT1060/imlib_config.h @@ -113,18 +113,15 @@ #define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE #define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -#define IMLIB_ENABLE_TF (IMLIB_TF_FULLOPS) +#define IMLIB_ENABLE_TFLM +#define IMLIB_ENABLE_TFLM_BUILTIN_FOMO_FACE_DETECTION +#define IMLIB_ENABLE_TFLM_BUILTIN_PERSON_DETECT #endif // Enable FAST (20+ KBs). -// #define IMLIB_ENABLE_FAST +#define IMLIB_ENABLE_FAST // Enable find_template() #define IMLIB_FIND_TEMPLATE diff --git a/src/omv/boards/PICO/imlib_config.h b/src/omv/boards/PICO/imlib_config.h index 391e0b6ac..2d4fb2b56 100644 --- a/src/omv/boards/PICO/imlib_config.h +++ b/src/omv/boards/PICO/imlib_config.h @@ -115,14 +115,9 @@ //#define IMLIB_ENABLE_FEATURES_BUILTIN_FACE_CASCADE //#define IMLIB_ENABLE_FEATURES_BUILTIN_EYES_CASCADE -// Enable CMSIS NN -// #if !defined(CUBEAI) -// #define IMLIB_ENABLE_CNN -// #endif - // Enable Tensor Flow #if !defined(CUBEAI) -//#define IMLIB_ENABLE_TF +//#define IMLIB_ENABLE_TFLM #endif // Enable FAST (20+ KBs).