From daca77ab313fbf43284140332744e8600d2c3585 Mon Sep 17 00:00:00 2001 From: jzlv Date: Tue, 26 Apr 2022 11:14:09 +0800 Subject: [PATCH] [refactor][examples/tensorflow] move demos into subdir --- examples/TFLM/vww_demo/CMakeLists.txt | 12 ------------ examples/tensorflow/{ => tflite_sinx}/CMakeLists.txt | 0 examples/tensorflow/{ => tflite_sinx}/constants.cc | 0 examples/tensorflow/{ => tflite_sinx}/constants.h | 0 examples/tensorflow/{ => tflite_sinx}/main.c | 0 .../tensorflow/{ => tflite_sinx}/main_functions.cc | 0 .../tensorflow/{ => tflite_sinx}/main_functions.h | 0 examples/tensorflow/{ => tflite_sinx}/model.cc | 0 examples/tensorflow/{ => tflite_sinx}/model.h | 0 .../tensorflow/{ => tflite_sinx}/output_handler.cc | 0 .../tensorflow/{ => tflite_sinx}/output_handler.h | 0 examples/tensorflow/{ => tflite_sinx}/readme.md | 0 examples/tensorflow/tflite_vww/CMakeLists.txt | 12 ++++++++++++ .../tflite_vww}/detection_responder.cc | 0 .../vww => tensorflow/tflite_vww}/image_proc.cc | 0 .../vww => tensorflow/tflite_vww}/image_proc.h | 0 .../vww => tensorflow/tflite_vww}/image_provider.cc | 0 .../vww => tensorflow/tflite_vww}/image_provider.h | 0 .../{TFLM/vww_demo => tensorflow/tflite_vww}/main.c | 4 ---- .../vww => tensorflow/tflite_vww}/main_functions.cc | 0 .../vww => tensorflow/tflite_vww}/main_functions.h | 0 .../vww => tensorflow/tflite_vww}/model_settings.cc | 0 .../vww_demo => tensorflow/tflite_vww}/readme.md | 2 +- .../tflite_vww}/tflite_camera_psram.ld | 0 .../tflite_vww}/vww2_50_50_INT8_model_data.cc | 0 25 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 examples/TFLM/vww_demo/CMakeLists.txt rename examples/tensorflow/{ => tflite_sinx}/CMakeLists.txt (100%) rename examples/tensorflow/{ => tflite_sinx}/constants.cc (100%) rename examples/tensorflow/{ => tflite_sinx}/constants.h (100%) rename examples/tensorflow/{ => tflite_sinx}/main.c (100%) rename examples/tensorflow/{ => tflite_sinx}/main_functions.cc (100%) rename examples/tensorflow/{ => tflite_sinx}/main_functions.h (100%) rename examples/tensorflow/{ => tflite_sinx}/model.cc (100%) rename examples/tensorflow/{ => tflite_sinx}/model.h (100%) rename examples/tensorflow/{ => tflite_sinx}/output_handler.cc (100%) rename examples/tensorflow/{ => tflite_sinx}/output_handler.h (100%) rename examples/tensorflow/{ => tflite_sinx}/readme.md (100%) create mode 100644 examples/tensorflow/tflite_vww/CMakeLists.txt rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/detection_responder.cc (100%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/image_proc.cc (100%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/image_proc.h (100%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/image_provider.cc (100%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/image_provider.h (100%) rename examples/{TFLM/vww_demo => tensorflow/tflite_vww}/main.c (95%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/main_functions.cc (100%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/main_functions.h (100%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/model_settings.cc (100%) rename examples/{TFLM/vww_demo => tensorflow/tflite_vww}/readme.md (87%) rename examples/{TFLM/vww_demo => tensorflow/tflite_vww}/tflite_camera_psram.ld (100%) rename examples/{TFLM/vww_demo/vww => tensorflow/tflite_vww}/vww2_50_50_INT8_model_data.cc (100%) diff --git a/examples/TFLM/vww_demo/CMakeLists.txt b/examples/TFLM/vww_demo/CMakeLists.txt deleted file mode 100644 index f1248f16..00000000 --- a/examples/TFLM/vww_demo/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(BSP_COMMON_DIR ${CMAKE_SOURCE_DIR}/bsp/bsp_common) -set(TARGET_REQUIRED_LIBS usb_stack tflite) -set(LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tflite_camera_psram.ld) -set(TARGET_REQUIRED_PRIVATE_INCLUDE ${BSP_COMMON_DIR}/usb ${BSP_COMMON_DIR}/psram ${BSP_COMMON_DIR}/image_sensor ${BSP_COMMON_DIR}/mcu_lcd ${CMAKE_CURRENT_SOURCE_DIR}/vww) -file(GLOB_RECURSE ref -"${CMAKE_CURRENT_SOURCE_DIR}/vww/*.cc" -) -set(TARGET_REQUIRED_SRCS ${BSP_COMMON_DIR}/usb/usb_dc.c ${BSP_COMMON_DIR}/psram/bsp_sf_psram.c ${BSP_COMMON_DIR}/image_sensor/bsp_image_sensor.c ${BSP_COMMON_DIR}/mcu_lcd/mcu_lcd.c ${BSP_COMMON_DIR}/mcu_lcd/font.c ${BSP_COMMON_DIR}/mcu_lcd/ili9341.c ${ref}) -set(mains main.c) -generate_bin() - - diff --git a/examples/tensorflow/CMakeLists.txt b/examples/tensorflow/tflite_sinx/CMakeLists.txt similarity index 100% rename from examples/tensorflow/CMakeLists.txt rename to examples/tensorflow/tflite_sinx/CMakeLists.txt diff --git a/examples/tensorflow/constants.cc b/examples/tensorflow/tflite_sinx/constants.cc similarity index 100% rename from examples/tensorflow/constants.cc rename to examples/tensorflow/tflite_sinx/constants.cc diff --git a/examples/tensorflow/constants.h b/examples/tensorflow/tflite_sinx/constants.h similarity index 100% rename from examples/tensorflow/constants.h rename to examples/tensorflow/tflite_sinx/constants.h diff --git a/examples/tensorflow/main.c b/examples/tensorflow/tflite_sinx/main.c similarity index 100% rename from examples/tensorflow/main.c rename to examples/tensorflow/tflite_sinx/main.c diff --git a/examples/tensorflow/main_functions.cc b/examples/tensorflow/tflite_sinx/main_functions.cc similarity index 100% rename from examples/tensorflow/main_functions.cc rename to examples/tensorflow/tflite_sinx/main_functions.cc diff --git a/examples/tensorflow/main_functions.h b/examples/tensorflow/tflite_sinx/main_functions.h similarity index 100% rename from examples/tensorflow/main_functions.h rename to examples/tensorflow/tflite_sinx/main_functions.h diff --git a/examples/tensorflow/model.cc b/examples/tensorflow/tflite_sinx/model.cc similarity index 100% rename from examples/tensorflow/model.cc rename to examples/tensorflow/tflite_sinx/model.cc diff --git a/examples/tensorflow/model.h b/examples/tensorflow/tflite_sinx/model.h similarity index 100% rename from examples/tensorflow/model.h rename to examples/tensorflow/tflite_sinx/model.h diff --git a/examples/tensorflow/output_handler.cc b/examples/tensorflow/tflite_sinx/output_handler.cc similarity index 100% rename from examples/tensorflow/output_handler.cc rename to examples/tensorflow/tflite_sinx/output_handler.cc diff --git a/examples/tensorflow/output_handler.h b/examples/tensorflow/tflite_sinx/output_handler.h similarity index 100% rename from examples/tensorflow/output_handler.h rename to examples/tensorflow/tflite_sinx/output_handler.h diff --git a/examples/tensorflow/readme.md b/examples/tensorflow/tflite_sinx/readme.md similarity index 100% rename from examples/tensorflow/readme.md rename to examples/tensorflow/tflite_sinx/readme.md diff --git a/examples/tensorflow/tflite_vww/CMakeLists.txt b/examples/tensorflow/tflite_vww/CMakeLists.txt new file mode 100644 index 00000000..f3b56e59 --- /dev/null +++ b/examples/tensorflow/tflite_vww/CMakeLists.txt @@ -0,0 +1,12 @@ +set(BSP_COMMON_DIR ${CMAKE_SOURCE_DIR}/bsp/bsp_common) +set(TARGET_REQUIRED_LIBS tflite) +set(LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tflite_camera_psram.ld) +set(TARGET_REQUIRED_PRIVATE_INCLUDE ${BSP_COMMON_DIR}/psram ${BSP_COMMON_DIR}/image_sensor ${BSP_COMMON_DIR}/mcu_lcd) +file(GLOB_RECURSE ref +"${CMAKE_CURRENT_SOURCE_DIR}/*.cc" +) +set(TARGET_REQUIRED_SRCS ${BSP_COMMON_DIR}/psram/bsp_sf_psram.c ${BSP_COMMON_DIR}/image_sensor/bsp_image_sensor.c ${BSP_COMMON_DIR}/mcu_lcd/mcu_lcd.c ${BSP_COMMON_DIR}/mcu_lcd/font.c ${BSP_COMMON_DIR}/mcu_lcd/ili9341.c ${ref}) +set(mains main.c) +generate_bin() + + diff --git a/examples/TFLM/vww_demo/vww/detection_responder.cc b/examples/tensorflow/tflite_vww/detection_responder.cc similarity index 100% rename from examples/TFLM/vww_demo/vww/detection_responder.cc rename to examples/tensorflow/tflite_vww/detection_responder.cc diff --git a/examples/TFLM/vww_demo/vww/image_proc.cc b/examples/tensorflow/tflite_vww/image_proc.cc similarity index 100% rename from examples/TFLM/vww_demo/vww/image_proc.cc rename to examples/tensorflow/tflite_vww/image_proc.cc diff --git a/examples/TFLM/vww_demo/vww/image_proc.h b/examples/tensorflow/tflite_vww/image_proc.h similarity index 100% rename from examples/TFLM/vww_demo/vww/image_proc.h rename to examples/tensorflow/tflite_vww/image_proc.h diff --git a/examples/TFLM/vww_demo/vww/image_provider.cc b/examples/tensorflow/tflite_vww/image_provider.cc similarity index 100% rename from examples/TFLM/vww_demo/vww/image_provider.cc rename to examples/tensorflow/tflite_vww/image_provider.cc diff --git a/examples/TFLM/vww_demo/vww/image_provider.h b/examples/tensorflow/tflite_vww/image_provider.h similarity index 100% rename from examples/TFLM/vww_demo/vww/image_provider.h rename to examples/tensorflow/tflite_vww/image_provider.h diff --git a/examples/TFLM/vww_demo/main.c b/examples/tensorflow/tflite_vww/main.c similarity index 95% rename from examples/TFLM/vww_demo/main.c rename to examples/tensorflow/tflite_vww/main.c index 17dc93d8..9345db93 100644 --- a/examples/TFLM/vww_demo/main.c +++ b/examples/tensorflow/tflite_vww/main.c @@ -20,10 +20,6 @@ * under the License. * */ - -#include "hal_usb.h" -#include "usbd_core.h" -#include "usbd_video.h" #include "mcu_lcd.h" #include "hal_dma.h" #include "hal_cam.h" diff --git a/examples/TFLM/vww_demo/vww/main_functions.cc b/examples/tensorflow/tflite_vww/main_functions.cc similarity index 100% rename from examples/TFLM/vww_demo/vww/main_functions.cc rename to examples/tensorflow/tflite_vww/main_functions.cc diff --git a/examples/TFLM/vww_demo/vww/main_functions.h b/examples/tensorflow/tflite_vww/main_functions.h similarity index 100% rename from examples/TFLM/vww_demo/vww/main_functions.h rename to examples/tensorflow/tflite_vww/main_functions.h diff --git a/examples/TFLM/vww_demo/vww/model_settings.cc b/examples/tensorflow/tflite_vww/model_settings.cc similarity index 100% rename from examples/TFLM/vww_demo/vww/model_settings.cc rename to examples/tensorflow/tflite_vww/model_settings.cc diff --git a/examples/TFLM/vww_demo/readme.md b/examples/tensorflow/tflite_vww/readme.md similarity index 87% rename from examples/TFLM/vww_demo/readme.md rename to examples/tensorflow/tflite_vww/readme.md index 0c4a5599..2041c87c 100644 --- a/examples/TFLM/vww_demo/readme.md +++ b/examples/tensorflow/tflite_vww/readme.md @@ -5,7 +5,7 @@ 编译命令： ```bash -$ make build SUPPORT_FLOAT=y BOARD=bl706_avb APP=vww_demo +$ make APP=tflite_vww BOARD=bl706_avb SUPPORT_FLOAT=y ``` NMSIS加速库: diff --git a/examples/TFLM/vww_demo/tflite_camera_psram.ld b/examples/tensorflow/tflite_vww/tflite_camera_psram.ld similarity index 100% rename from examples/TFLM/vww_demo/tflite_camera_psram.ld rename to examples/tensorflow/tflite_vww/tflite_camera_psram.ld diff --git a/examples/TFLM/vww_demo/vww/vww2_50_50_INT8_model_data.cc b/examples/tensorflow/tflite_vww/vww2_50_50_INT8_model_data.cc similarity index 100% rename from examples/TFLM/vww_demo/vww/vww2_50_50_INT8_model_data.cc rename to examples/tensorflow/tflite_vww/vww2_50_50_INT8_model_data.cc