Skip to content

Commit 0f2b8ed

Browse files
GRATTINSTMGRATTINSTM
committed
Update to v2.1.0
- Update to Cube FW to v1.2.0 - Update to STEdgeAI v2.2.0 - Add int8 post processing support for: - Object detection Yolo v2 - Object detection Yolo v8 - Object detection ST Yolo X - Single pose estimation Movenet - Multi pose estimation Yolo v8 - Semantic segmentation Deeplab v3 - Add support for BlazeFace post processing
1 parent 2423082 commit 0f2b8ed

File tree

5,633 files changed

+662284
-1410677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,633 files changed

+662284
-1410677
lines changed

‎Application/NUCLEO-N657X0-Q/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ CFLAGS += -std=gnu11
190190
LDSCRIPT = STM32CubeIDE/STM32N657xx.ld
191191

192192
# libraries
193-
LIBS = -lc -lm -lnosys -l:NetworkRuntime1010_CM55_GCC.a -ln6-evision-awb_gcc -ln6-evision-st-ae_gcc
193+
LIBS = -lc -lm -lnosys -l:NetworkRuntime1020_CM55_GCC.a -ln6-evision-awb_gcc -ln6-evision-st-ae_gcc
194194
LIBDIR = -L../../Middlewares/AI_Runtime/Lib/GCC/ARMCortexM55
195195
LIBDIR += -L../../Middlewares/Camera_Middleware/ISP_Library/evision/Lib
196196
LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections

‎Application/NUCLEO-N657X0-Q/STM32CubeIDE/.cproject‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<listOptionValue builtIn="false" value="../../../../Middlewares/Camera_Middleware/ISP_Library/evision/Lib"/>
106106
</option>
107107
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1766099669" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
108-
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":NetworkRuntime1010_CM55_GCC.a"/>
108+
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":NetworkRuntime1020_CM55_GCC.a"/>
109109
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":libn6-evision-awb_gcc.a"/>
110110
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":libn6-evision-st-ae_gcc.a"/>
111111
</option>
@@ -239,7 +239,7 @@
239239
<listOptionValue builtIn="false" value="../../../../Middlewares/Camera_Middleware/ISP_Library/evision/Lib"/>
240240
</option>
241241
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.183993758" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
242-
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":NetworkRuntime1010_CM55_GCC.a"/>
242+
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":NetworkRuntime1020_CM55_GCC.a"/>
243243
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":libn6-evision-awb_gcc.a"/>
244244
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":libn6-evision-st-ae_gcc.a"/>
245245
</option>

‎Application/NUCLEO-N657X0-Q/Src/main.c‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
#include "stm32_lcd.h"
2424
#include "app_fuseprogramming.h"
2525
#include "stm32_lcd_ex.h"
26-
#include "ll_aton_runtime.h"
26+
#include "ll_aton_rt_user_api.h"
27+
LL_ATON_DECLARE_NAMED_NN_INSTANCE_AND_INTERFACE(Default);
2728
#include "app_camerapipeline.h"
2829
#include "main.h"
2930
#include <stdio.h>
@@ -77,20 +78,6 @@ Rectangle_TypeDef lcd_fg_area = {
7778
.YSize = 0,
7879
};
7980

80-
#define NUMBER_COLORS 10
81-
const uint32_t colors[NUMBER_COLORS] = {
82-
UTIL_LCD_COLOR_GREEN,
83-
UTIL_LCD_COLOR_RED,
84-
UTIL_LCD_COLOR_CYAN,
85-
UTIL_LCD_COLOR_MAGENTA,
86-
UTIL_LCD_COLOR_YELLOW,
87-
UTIL_LCD_COLOR_GRAY,
88-
UTIL_LCD_COLOR_BLACK,
89-
UTIL_LCD_COLOR_BROWN,
90-
UTIL_LCD_COLOR_BLUE,
91-
UTIL_LCD_COLOR_ORANGE
92-
};
93-
9481
volatile int32_t cameraFrameReceived;
9582
uint8_t *nn_in;
9683
void *pp_input;
@@ -133,6 +120,7 @@ static void set_clk_sleep_mode(void);
133120
static void IAC_Config(void);
134121
static void Display_WelcomeScreen(void);
135122
static void Hardware_init(void);
123+
static void Run_Inference(void);
136124
static void NeuralNetwork_init(uint32_t *nnin_length, float32_t *nn_out[], int *number_output, int32_t nn_out_len[]);
137125

138126

@@ -152,7 +140,6 @@ int main(void)
152140
int number_output = 0;
153141
float32_t *nn_out[MAX_NUMBER_OUTPUT];
154142
int32_t nn_out_len[MAX_NUMBER_OUTPUT];
155-
LL_ATON_DECLARE_NAMED_NN_INSTANCE_AND_INTERFACE(Default);
156143
NeuralNetwork_init(&nn_in_len, nn_out, &number_output, nn_out_len);
157144

158145
/*** Post Processing Init ***************************************************/
@@ -201,7 +188,7 @@ int main(void)
201188

202189
ts[0] = HAL_GetTick();
203190
/* run ATON inference */
204-
LL_ATON_RT_Main(&NN_Instance_Default);
191+
Run_Inference();
205192
ts[1] = HAL_GetTick();
206193

207194
Network_Postprocess();
@@ -259,10 +246,27 @@ static void Hardware_init(void)
259246

260247
}
261248

249+
static void Run_Inference(void) {
250+
LL_ATON_RT_RetValues_t ll_aton_rt_ret;
251+
252+
do
253+
{
254+
ll_aton_rt_ret = LL_ATON_RT_RunEpochBlock(&NN_Instance_Default);
255+
256+
/* Wait for next event */
257+
if (ll_aton_rt_ret == LL_ATON_RT_WFE)
258+
{
259+
LL_ATON_OSAL_WFE();
260+
}
261+
} while (ll_aton_rt_ret != LL_ATON_RT_DONE);
262+
263+
LL_ATON_RT_Reset_Network(&NN_Instance_Default);
264+
}
265+
262266
static void NeuralNetwork_init(uint32_t *nnin_length, float32_t *nn_out[], int *number_output, int32_t nn_out_len[])
263267
{
264-
const LL_Buffer_InfoTypeDef *nn_in_info = LL_ATON_Input_Buffers_Info_Default();
265-
const LL_Buffer_InfoTypeDef *nn_out_info = LL_ATON_Output_Buffers_Info_Default();
268+
const LL_Buffer_InfoTypeDef *nn_in_info = LL_ATON_Input_Buffers_Info(&NN_Instance_Default);
269+
const LL_Buffer_InfoTypeDef *nn_out_info = LL_ATON_Output_Buffers_Info(&NN_Instance_Default);
266270

267271
// Get the input buffer address
268272
nn_in = (uint8_t *) LL_Buffer_addr_start(&nn_in_info[0]);
@@ -282,6 +286,9 @@ static void NeuralNetwork_init(uint32_t *nnin_length, float32_t *nn_out[], int *
282286
}
283287

284288
*nnin_length = LL_Buffer_len(&nn_in_info[0]);
289+
290+
LL_ATON_RT_RuntimeInit();
291+
LL_ATON_RT_Init_Network(&NN_Instance_Default);
285292
}
286293

287294
static void NPURam_enable(void)

‎Application/STM32N6570-DK/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ CFLAGS += -std=gnu11
178178
LDSCRIPT = STM32CubeIDE/STM32N657xx.ld
179179

180180
# libraries
181-
LIBS = -lc -lm -lnosys -l:NetworkRuntime1010_CM55_GCC.a -ln6-evision-awb_gcc -ln6-evision-st-ae_gcc
181+
LIBS = -lc -lm -lnosys -l:NetworkRuntime1020_CM55_GCC.a -ln6-evision-awb_gcc -ln6-evision-st-ae_gcc
182182
LIBDIR = -L../../Middlewares/AI_Runtime/Lib/GCC/ARMCortexM55
183183
LIBDIR += -L../../Middlewares/Camera_Middleware/ISP_Library/evision/Lib
184184
LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections

‎Application/STM32N6570-DK/STM32CubeIDE/.cproject‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<listOptionValue builtIn="false" value="../../../../Middlewares/Camera_Middleware/ISP_Library/evision/Lib"/>
8888
</option>
8989
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1377455477" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
90-
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":NetworkRuntime1010_CM55_GCC.a"/>
90+
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":NetworkRuntime1020_CM55_GCC.a"/>
9191
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":libn6-evision-awb_gcc.a"/>
9292
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value=":libn6-evision-st-ae_gcc.a"/>
9393
</option>

‎Application/STM32N6570-DK/Src/main.c‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
#include "stm32_lcd.h"
2424
#include "app_fuseprogramming.h"
2525
#include "stm32_lcd_ex.h"
26-
#include "ll_aton_runtime.h"
26+
#include "ll_aton_rt_user_api.h"
27+
LL_ATON_DECLARE_NAMED_NN_INSTANCE_AND_INTERFACE(Default);
2728
#include "app_camerapipeline.h"
2829
#include "main.h"
2930
#include <stdio.h>
@@ -124,6 +125,7 @@ static void set_clk_sleep_mode(void);
124125
static void IAC_Config(void);
125126
static void Display_WelcomeScreen(void);
126127
static void Hardware_init(void);
128+
static void Run_Inference(void);
127129
static void NeuralNetwork_init(uint32_t *nnin_length, float32_t *nn_out[], int *number_output, int32_t nn_out_len[]);
128130

129131

@@ -143,7 +145,6 @@ int main(void)
143145
int number_output = 0;
144146
float32_t *nn_out[MAX_NUMBER_OUTPUT] = {0};
145147
int32_t nn_out_len[MAX_NUMBER_OUTPUT] = {0};
146-
LL_ATON_DECLARE_NAMED_NN_INSTANCE_AND_INTERFACE(Default);
147148
NeuralNetwork_init(&nn_in_len, nn_out, &number_output, nn_out_len);
148149

149150
/*** Post Processing Init ***************************************************/
@@ -192,7 +193,7 @@ int main(void)
192193

193194
ts[0] = HAL_GetTick();
194195
/* run ATON inference */
195-
LL_ATON_RT_Main(&NN_Instance_Default);
196+
Run_Inference();
196197
ts[1] = HAL_GetTick();
197198

198199
Network_Postprocess();
@@ -253,10 +254,27 @@ static void Hardware_init(void)
253254

254255
}
255256

257+
static void Run_Inference(void) {
258+
LL_ATON_RT_RetValues_t ll_aton_rt_ret;
259+
260+
do
261+
{
262+
ll_aton_rt_ret = LL_ATON_RT_RunEpochBlock(&NN_Instance_Default);
263+
264+
/* Wait for next event */
265+
if (ll_aton_rt_ret == LL_ATON_RT_WFE)
266+
{
267+
LL_ATON_OSAL_WFE();
268+
}
269+
} while (ll_aton_rt_ret != LL_ATON_RT_DONE);
270+
271+
LL_ATON_RT_Reset_Network(&NN_Instance_Default);
272+
}
273+
256274
static void NeuralNetwork_init(uint32_t *nnin_length, float32_t *nn_out[], int *number_output, int32_t nn_out_len[])
257275
{
258-
const LL_Buffer_InfoTypeDef *nn_in_info = LL_ATON_Input_Buffers_Info_Default();
259-
const LL_Buffer_InfoTypeDef *nn_out_info = LL_ATON_Output_Buffers_Info_Default();
276+
const LL_Buffer_InfoTypeDef *nn_in_info = LL_ATON_Input_Buffers_Info(&NN_Instance_Default);
277+
const LL_Buffer_InfoTypeDef *nn_out_info = LL_ATON_Output_Buffers_Info(&NN_Instance_Default);
260278

261279
// Get the input buffer address
262280
nn_in = (uint8_t *) LL_Buffer_addr_start(&nn_in_info[0]);
@@ -276,6 +294,9 @@ static void NeuralNetwork_init(uint32_t *nnin_length, float32_t *nn_out[], int *
276294
}
277295

278296
*nnin_length = LL_Buffer_len(&nn_in_info[0]);
297+
298+
LL_ATON_RT_RuntimeInit();
299+
LL_ATON_RT_Init_Network(&NN_Instance_Default);
279300
}
280301

281302
static void NPURam_enable(void)

0 commit comments

Comments
 (0)