diff --git a/src/libtf/cortex-m4/libtf.a b/src/libtf/cortex-m4/libtf.a index 7222974dc..3ea9a70b7 100644 Binary files a/src/libtf/cortex-m4/libtf.a and b/src/libtf/cortex-m4/libtf.a differ diff --git a/src/libtf/cortex-m4/libtf.h b/src/libtf/cortex-m4/libtf.h index 2a59b7c55..e4b2cd2e9 100644 --- a/src/libtf/cortex-m4/libtf.h +++ b/src/libtf/cortex-m4/libtf.h @@ -20,7 +20,7 @@ int libtf_get_input_data_hwc(const unsigned char *model_data, // TensorFlow Lite unsigned int *input_width, // Width for the model. unsigned int *input_channels, // Channels for the model (1 for grayscale8 and 3 for rgb888). bool *signed_or_unsigned, // True if input is int8_t ([0:255]->[-128:127]), False if input is uint8_t ([0:255]->[0:255]). - bool *is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[-1.0f:+1.0f]). + bool *is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[0.0f:+1.0f]). // Call this second to get the shape of the model output. // Returns 0 on success and 1 on failure. @@ -32,7 +32,7 @@ int libtf_get_output_data_hwc(const unsigned char *model_data, // TensorFlow Lit unsigned int *output_width, // Width for the model. unsigned int *output_channels, // Channels for the model (1 for grayscale8 and 3 for rgb888). bool *signed_or_unsigned, // True if output is int8_t ([-128:127]->[0:255]->[0.0f:1.0f]), False if output is uint8_t ([0:255]->[0:255]->[0.0f:1.0f]). - bool *is_float); // Actual is float32 (not optimal - network should be fixed). Output should be ([-1.0f:+1.0f]->[0:255]->[0.0f:1.0f]). + bool *is_float); // Actual is float32 (not optimal - network should be fixed). Output is [0.0f:+1.0f]. // 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, @@ -41,7 +41,7 @@ typedef void (*libtf_input_data_callback_t)(void *callback_data, const unsigned int input_width, const unsigned int input_channels, const bool signed_or_unsigned, // True if input is int8_t ([0:255]->[-128:127]), False if input is uint8_t ([0:255]->[0:255]). - const bool is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[-1.0f:+1.0f]). + const bool is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[0.0f:+1.0f]). // Callback to use the model output data byte array (laid out in [height][width][channel] order). typedef void (*libtf_output_data_callback_t)(void *callback_data, @@ -50,7 +50,7 @@ typedef void (*libtf_output_data_callback_t)(void *callback_data, const unsigned int output_width, const unsigned int output_channels, const bool signed_or_unsigned, // True if output is int8_t ([-128:127]->[0:255]->[0.0f:1.0f]), False if output is uint8_t ([0:255]->[0:255]->[0.0f:1.0f]). - const bool is_float); // Actual is float32 (not optimal - network should be fixed). Output should be ([-1.0f:+1.0f]->[0:255]->[0.0f:1.0f]). + const bool is_float); // Actual is float32 (not optimal - network should be fixed). Output is [0.0f:+1.0f]. // Returns 0 on success and 1 on failure. // Errors are printed to stdout. diff --git a/src/libtf/cortex-m4/libtf_person_detect_model_data.a b/src/libtf/cortex-m4/libtf_person_detect_model_data.a index df1a1ebfc..59427cc97 100644 Binary files a/src/libtf/cortex-m4/libtf_person_detect_model_data.a and b/src/libtf/cortex-m4/libtf_person_detect_model_data.a differ diff --git a/src/libtf/cortex-m7/libtf.a b/src/libtf/cortex-m7/libtf.a index 63b82eb5f..adc0de6b8 100644 Binary files a/src/libtf/cortex-m7/libtf.a and b/src/libtf/cortex-m7/libtf.a differ diff --git a/src/libtf/cortex-m7/libtf.h b/src/libtf/cortex-m7/libtf.h index 2a59b7c55..e4b2cd2e9 100644 --- a/src/libtf/cortex-m7/libtf.h +++ b/src/libtf/cortex-m7/libtf.h @@ -20,7 +20,7 @@ int libtf_get_input_data_hwc(const unsigned char *model_data, // TensorFlow Lite unsigned int *input_width, // Width for the model. unsigned int *input_channels, // Channels for the model (1 for grayscale8 and 3 for rgb888). bool *signed_or_unsigned, // True if input is int8_t ([0:255]->[-128:127]), False if input is uint8_t ([0:255]->[0:255]). - bool *is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[-1.0f:+1.0f]). + bool *is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[0.0f:+1.0f]). // Call this second to get the shape of the model output. // Returns 0 on success and 1 on failure. @@ -32,7 +32,7 @@ int libtf_get_output_data_hwc(const unsigned char *model_data, // TensorFlow Lit unsigned int *output_width, // Width for the model. unsigned int *output_channels, // Channels for the model (1 for grayscale8 and 3 for rgb888). bool *signed_or_unsigned, // True if output is int8_t ([-128:127]->[0:255]->[0.0f:1.0f]), False if output is uint8_t ([0:255]->[0:255]->[0.0f:1.0f]). - bool *is_float); // Actual is float32 (not optimal - network should be fixed). Output should be ([-1.0f:+1.0f]->[0:255]->[0.0f:1.0f]). + bool *is_float); // Actual is float32 (not optimal - network should be fixed). Output is [0.0f:+1.0f]. // 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, @@ -41,7 +41,7 @@ typedef void (*libtf_input_data_callback_t)(void *callback_data, const unsigned int input_width, const unsigned int input_channels, const bool signed_or_unsigned, // True if input is int8_t ([0:255]->[-128:127]), False if input is uint8_t ([0:255]->[0:255]). - const bool is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[-1.0f:+1.0f]). + const bool is_float); // Actual is float32 (not optimal - network should be fixed). Input should be ([0:255]->[0.0f:+1.0f]). // Callback to use the model output data byte array (laid out in [height][width][channel] order). typedef void (*libtf_output_data_callback_t)(void *callback_data, @@ -50,7 +50,7 @@ typedef void (*libtf_output_data_callback_t)(void *callback_data, const unsigned int output_width, const unsigned int output_channels, const bool signed_or_unsigned, // True if output is int8_t ([-128:127]->[0:255]->[0.0f:1.0f]), False if output is uint8_t ([0:255]->[0:255]->[0.0f:1.0f]). - const bool is_float); // Actual is float32 (not optimal - network should be fixed). Output should be ([-1.0f:+1.0f]->[0:255]->[0.0f:1.0f]). + const bool is_float); // Actual is float32 (not optimal - network should be fixed). Output is [0.0f:+1.0f]. // Returns 0 on success and 1 on failure. // Errors are printed to stdout. diff --git a/src/libtf/cortex-m7/libtf_person_detect_model_data.a b/src/libtf/cortex-m7/libtf_person_detect_model_data.a index f94e85e2a..7cb9da3aa 100644 Binary files a/src/libtf/cortex-m7/libtf_person_detect_model_data.a and b/src/libtf/cortex-m7/libtf_person_detect_model_data.a differ diff --git a/src/omv/boards/OPENMV3/imlib_config.h b/src/omv/boards/OPENMV3/imlib_config.h index 4b5f0e523..b9efeb278 100644 --- a/src/omv/boards/OPENMV3/imlib_config.h +++ b/src/omv/boards/OPENMV3/imlib_config.h @@ -132,9 +132,9 @@ #define IMLIB_ENABLE_BARCODES // Enable CMSIS NN -#if !defined(CUBEAI) -#define IMLIB_ENABLE_CNN -#endif +// #if !defined(CUBEAI) +// #define IMLIB_ENABLE_CNN +// #endif // Enable Tensor Flow #if !defined(CUBEAI) diff --git a/src/omv/boards/OPENMV4/imlib_config.h b/src/omv/boards/OPENMV4/imlib_config.h index 00d48da61..818fa01e5 100644 --- a/src/omv/boards/OPENMV4/imlib_config.h +++ b/src/omv/boards/OPENMV4/imlib_config.h @@ -132,9 +132,9 @@ #define IMLIB_ENABLE_BARCODES // Enable CMSIS NN -#if !defined(CUBEAI) -#define IMLIB_ENABLE_CNN -#endif +// #if !defined(CUBEAI) +// #define IMLIB_ENABLE_CNN +// #endif // Enable Tensor Flow #if !defined(CUBEAI) diff --git a/src/omv/boards/OPENMV4P/imlib_config.h b/src/omv/boards/OPENMV4P/imlib_config.h index 45d7a0446..7415a5934 100644 --- a/src/omv/boards/OPENMV4P/imlib_config.h +++ b/src/omv/boards/OPENMV4P/imlib_config.h @@ -132,9 +132,9 @@ #define IMLIB_ENABLE_BARCODES // Enable CMSIS NN -#if !defined(CUBEAI) -#define IMLIB_ENABLE_CNN -#endif +// #if !defined(CUBEAI) +// #define IMLIB_ENABLE_CNN +// #endif // Enable Tensor Flow #if !defined(CUBEAI) diff --git a/src/omv/boards/PORTENTA/imlib_config.h b/src/omv/boards/PORTENTA/imlib_config.h index 00d48da61..818fa01e5 100644 --- a/src/omv/boards/PORTENTA/imlib_config.h +++ b/src/omv/boards/PORTENTA/imlib_config.h @@ -132,9 +132,9 @@ #define IMLIB_ENABLE_BARCODES // Enable CMSIS NN -#if !defined(CUBEAI) -#define IMLIB_ENABLE_CNN -#endif +// #if !defined(CUBEAI) +// #define IMLIB_ENABLE_CNN +// #endif // Enable Tensor Flow #if !defined(CUBEAI)