Update to v2.1.0

- Upgrade to STEdgeAI 3.0.0

Author: GHORTESSTM

Application/NUCLEO-H743ZI2/Inc/ai_interface.h

@@ -1,12 +1,12 @@
 /**
  ******************************************************************************
  * @file    ai_interface.h
- * @author  MDG Application Team
+ * @author  MCD Application Team
  * @brief   Header for ai_interface.c module
  ******************************************************************************
  * @attention
  *
- * Copyright (c) 2023 STMicroelectronics.
+ * Copyright (c) 2019 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -28,23 +28,36 @@ extern "C"
 /* Includes ------------------------------------------------------------------*/
 #include "network.h"
 #include "network_data.h"
+#include "ai_platform.h"
 
 /* Exported macros -----------------------------------------------------------*/
-#define AI_NET_INPUT_SIZE AI_NETWORK_IN_1_SIZE
-#define AI_NET_INPUT_SIZE_BYTES AI_NETWORK_IN_1_SIZE_BYTES
+#define AI_NET_INPUT_SIZE STAI_NETWORK_IN_1_SIZE
+#define AI_NET_INPUT_SIZE_BYTES STAI_NETWORK_IN_1_SIZE_BYTES
 
-#define AI_NET_OUTPUT_SIZE AI_NETWORK_OUT_1_SIZE
-#define AI_NET_OUTPUT_SIZE_BYTES AI_NETWORK_OUT_1_SIZE_BYTES
+#define AI_NET_OUTPUT_SIZE STAI_NETWORK_OUT_1_SIZE
+#define AI_NET_OUTPUT_SIZE_BYTES STAI_NETWORK_OUT_1_SIZE_BYTES
+#define AI_ACTIVATION_SIZE_BYTES_TOTAL STAI_NETWORK_ACTIVATIONS_SIZE_BYTES
+#define AI_ACTIVATION_SIZE_BYTES STAI_NETWORK_ACTIVATIONS_SIZE
+#define AI_ACTIVATION_1_SIZE_BYTES STAI_NETWORK_ACTIVATION_1_SIZE
+#define AI_ACTIVATION_2_SIZE_BYTES STAI_NETWORK_ACTIVATION_2_SIZE
+#define AI_ACTIVATION_3_SIZE_BYTES STAI_NETWORK_ACTIVATION_3_SIZE
+#define AI_ACTIVATION_BUFFERS_COUNT STAI_NETWORK_ACTIVATIONS_NUM
 
-#define AI_ACTIVATION_SIZE_BYTES AI_NETWORK_DATA_ACTIVATIONS_SIZE
-#define AI_WEIGHT_SIZE_BYTES      AI_NETWORK_DATA_WEIGHTS_SIZE
+ /*** @GENERATED CODE START - DO NOT TOUCH@ ***/
+#define AI_NETWORK_INPUTS_IN_ACTIVATIONS_INDEX 0
+#define AI_NETWORK_INPUTS_IN_ACTIVATIONS_SIZE AI_ACTIVATION_1_SIZE_BYTES
+
+ /*** @GENERATED CODE STOP - DO NOT TOUCH@ ***/
+
+
+#define AI_WEIGHT_SIZE_BYTES      STAI_NETWORK_WEIGHTS_SIZE_BYTES
 
 #define AI_NETWORK_IN_SHIFT   1
 #define AI_NETWORK_OUT_SHIFT  7
 
-#define AI_NETWORK_WIDTH    AI_NETWORK_IN_1_WIDTH
-#define AI_NETWORK_HEIGHT   AI_NETWORK_IN_1_HEIGHT
-#define AI_NETWORK_CHANNEL  AI_NETWORK_IN_1_CHANNEL
+#define AI_NETWORK_WIDTH    STAI_NETWORK_IN_1_WIDTH
+#define AI_NETWORK_HEIGHT   STAI_NETWORK_IN_1_HEIGHT
+#define AI_NETWORK_CHANNEL  STAI_NETWORK_IN_1_CHANNEL
 
 /*********Quantization scheme******************/
 #define AI_FXP_Q          (0x0) /*Fixed Point Qm,n*/
@@ -60,12 +73,12 @@ ai_float ai_get_output_scale(void);
 ai_i32 ai_get_output_zero_point(void);
 uint32_t ai_get_input_quantization_scheme(void);
 uint32_t ai_get_output_quantization_scheme(void);
-ai_size ai_get_output_format(void);
-ai_size ai_get_input_format(void);
+stai_format ai_get_output_format(void);
+stai_format ai_get_input_format(void);
 
-void  ai_init(void*, ai_handle*, ai_handle*);
+void ai_init(uint8_t** activation_buffer, stai_ptr* inputs_buff_Ptr, stai_ptr* outputs_buff_Ptr);
 void ai_deinit(void);
-void ai_run(void*, void*);
+void ai_run(void);
 
 #ifdef __cplusplus
 }

Application/NUCLEO-H743ZI2/Inc/main.h

@@ -1,12 +1,12 @@
 /**
  ******************************************************************************
  * @file    main.h
- * @author  MDG Application Team
+ * @author  MCD Application Team
  * @brief   Header for main.c module for Cortex-M7.
  ******************************************************************************
  * @attention
  *
- * Copyright (c) 2023 STMicroelectronics.
+ * Copyright (c) 2021 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -33,15 +33,14 @@
 
 #include "ai_model_config.h"
 
-/* Exported macro ------------------------------------------------------------*/
-#define WELCOME_MSG_0             AI_NETWORK_ORIGIN_MODEL_NAME
+#define WELCOME_MSG_0             STAI_NETWORK_ORIGIN_MODEL_NAME
 #define WELCOME_MSG_1            "Model Running in STM32 MCU internal memory"
 
-#if defined (AI_NETWORK_INPUTS_IN_ACTIVATIONS) && defined (AI_NETWORK_OUTPUTS_IN_ACTIVATIONS) 
+#if (STAI_NETWORK_FLAGS & STAI_FLAG_OUTPUTS) == STAI_FLAG_OUTPUTS && (STAI_NETWORK_FLAGS & STAI_FLAG_INPUTS) == STAI_FLAG_INPUTS
  #define WELCOME_MSG_2            "NN Input and Ouput buffers in Activation"
-#elif defined (AI_NETWORK_INPUTS_IN_ACTIVATIONS)
+#elif (STAI_NETWORK_FLAGS & STAI_FLAG_INPUTS) == STAI_FLAG_INPUTS
  #define WELCOME_MSG_2            "NN Input buffer in Activation"
-#elif defined (AI_NETWORK_OUTPUTS_IN_ACTIVATIONS)
+#elif (STAI_NETWORK_FLAGS & STAI_FLAG_OUTPUTS) == STAI_FLAG_OUTPUTS
  #define WELCOME_MSG_2            "NN Output buffer in Activation"
 #else
  #define WELCOME_MSG_2            "NN Input/Output in dedicated buffers "
@@ -69,6 +68,7 @@
 
 #define NN_OUTPUT_CLASS_NUMBER AI_NET_OUTPUT_SIZE
 
+
 /****************************/
 /***CAMERA related defines***/
 /****************************/
@@ -227,10 +227,11 @@ typedef enum
   FRAME_PFC        = 0x02,
   FRAME_PVC        = 0x03,
   FRAME_INFERENCE  = 0x04,
-  
-  APP_FRAMEOPERATION_NUM  
+
+  APP_FRAMEOPERATION_NUM
 } AppFrameOperation_TypeDef;
 
+/* Exported types ------------------------------------------------------------*/
 typedef struct
 {
 uint16_t x;
@@ -239,52 +240,52 @@ uint32_t rowStride;
 } Dma2dCfg_TypeDef;
 
 typedef struct
-{ 
+{
   /**NN Output**/
   uint32_t nn_inference_time;
   char const* nn_top1_output_class_name;
   float nn_top1_output_class_proba;
   int ranking[NN_OUTPUT_CLASS_NUMBER];
-  
+
   /**Camera context**/
   volatile uint8_t new_frame_ready;
   uint32_t mirror_flip;
   uint32_t cropping_enable;
-  
+
   /**Pre-Processing context**/
   uint32_t red_blue_swap;
   uint32_t PixelFormatConv;
- 
+
   /**Display context**/
   volatile uint32_t lcd_sync;
-  
+
   /**Utility context**/
   uint32_t Tinf_start;
   uint32_t Tinf_stop;
   uint32_t Tfps_start;
   uint32_t Tfps_stop;
-  
+
   /**AI NN context**/
   uint8_t* lut;
-  uint32_t nn_input_type; 
+  uint32_t nn_input_type;
   uint32_t nn_output_type;
   const char** nn_output_labels;
-  
+
   /**Application buffers**/
-  void* nn_output_buffer;
-  void* nn_input_buffer;
-  void* activation_buffer;
+  void* nn_output_buffer[STAI_NETWORK_OUT_NUM];
+  void* nn_input_buffer[STAI_NETWORK_IN_NUM];
+  uint8_t* activation_buffer[AI_ACTIVATION_BUFFERS_COUNT];
   uint8_t* rescaled_image_buffer;
   uint8_t* camera_capture_buffer;
   uint8_t* camera_capture_buffer_no_borders;
   uint8_t *lcd_frame_buff; /* Only one buffer is used for output to save RAM */
-  
-} AppConfig_TypeDef;
 
-/* Exported variables  -------------------------------------------------------*/
-extern uint8_t NN_Activation_Buffer[];
+}AppConfig_TypeDef;
 
-/* Exported functions --------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
 extern void Error_Handler(void);
 
 #endif /* __MAIN_H */