component: Update MLEK

Signed-off-by: Gergely Korcsák <[email protected]>

Author: gergelykarm

applications/keyword_detection/ml_interface.cc

@@ -1053,7 +1053,6 @@ static int prvMlInterfaceInit()
 
     caseContext.Set<const std::vector<std::string> &>( "labels", labels );
 
-    PrintTensorFlowVersion();
     LogInfo( ( "*** ML interface initialised\r\n" ) );
     return 0;
 }

applications/object_detection/ml_interface.cc

@@ -487,7 +487,6 @@ static int prvMlInterfaceInit( void )
     /* Instantiate application context. */
     xCaseContext.Set<arm::app::Model &>( "model", xModel );
 
-    PrintTensorFlowVersion();
     LogInfo( ( "*** ML interface initialised\r\n" ) );
     return 0;
 }

applications/speech_recognition/ml_interface.cc

@@ -579,7 +579,6 @@ static int prvMlInterfaceInit( void )
     caseContext.Set<const std::vector<std::string> &>( "labels", labels );
     caseContext.Set<arm::app::AsrClassifier &>( "classifier", classifier );
 
-    PrintTensorFlowVersion();
     LogInfo( ( "*** ML interface initialised\r\n" ) );
     return 0;
 }

components/ai/ml_embedded_evaluation_kit/CMakeLists.txt

@@ -14,5 +14,11 @@ set(PATCH_FILES_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/integration/patches")
 set(PATCH_FILES
     "${PATCH_FILES_DIRECTORY}/0001-User-defined-resources-download-path.patch"
     "${PATCH_FILES_DIRECTORY}/0002-Use-CMSIS_device_header-instead-of-RTE_Components.h.patch"
+    "${PATCH_FILES_DIRECTORY}/0003-Make-ETHOSU_ARCH-configurable-in-TensorFlow-CMake.patch"
 )
 iot_reference_arm_corstone3xx_apply_patches("${ml_embedded_evaluation_kit_SOURCE_DIR}" "${PATCH_FILES}")
+
+set(PATCH_FILES
+    "${PATCH_FILES_DIRECTORY}/0004-Patch-tensorflow.patch"
+)
+iot_reference_arm_corstone3xx_apply_patches("${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/tensorflow/" "${PATCH_FILES}")

components/ai/ml_embedded_evaluation_kit/integration/cmake/SetupMlEmbeddedEvaluationKitLibraries.cmake

@@ -9,11 +9,13 @@ include(ExternalProject)
 ###########################
 #set(LOG_LEVEL LOG_LEVEL_TRACE)
 
+set(CMSIS_VER                   5)
+
 # External repositories
-set(CMSIS_SRC_PATH              "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/cmsis")
+set(CMSIS_SRC_PATH              "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/cmsis-${CMSIS_VER}")
 set(CMSIS_DSP_SRC_PATH          "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/cmsis-dsp")
 set(CMSIS_DSP_INC_DIR           "${CMSIS_DSP_SRC_PATH}/Include")
-set(CMSIS_CORE_INC_DIR          "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/CMSIS/Core/Include")
+set(CMSIS_CORE_INC_DIR          "${CMSIS_SRC_PATH}/CMSIS/Core/Include")
 set(CMSIS_NN_SRC_PATH           "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/cmsis-nn")
 set(TENSORFLOW_SRC_PATH         "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/tensorflow")
 set(ETHOS_U_NPU_DRIVER_SRC_PATH "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/core-driver")

components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateObjectDetectionModel.cmake

@@ -20,7 +20,7 @@ set(OBJECT_DETECTION_IMAGE_SIZE 192)
 set(OBJECT_DETECTION_ANCHOR_1 "{38, 77, 47, 97, 61, 126}")
 set(OBJECT_DETECTION_ANCHOR_2 "{14, 26, 19, 37, 28, 55 }")
 set(OBJECT_DETECTION_ORIGINAL_IMAGE_SIZE ${OBJECT_DETECTION_IMAGE_SIZE})
-set(OBJECT_DETECTION_ACTIVATION_BUF_SZ 0x00082000)
+set(OBJECT_DETECTION_ACTIVATION_BUF_SZ 0x00182000)
 
 if (ETHOS_U_NPU_ENABLED)
     set(DEFAULT_MODEL_PATH      ${DEFAULT_MODEL_DIR}/yolo-fastest_192_face_v4_vela_${ETHOS_U_NPU_CONFIG_ID}.tflite)

components/ai/ml_embedded_evaluation_kit/integration/patches/0001-User-defined-resources-download-path.patch

@@ -14,92 +14,89 @@ Signed-off-by: Ahmed Ismail <[email protected]>
  1 file changed, 14 insertions(+), 7 deletions(-)
 
 diff --git a/set_up_default_resources.py b/set_up_default_resources.py
-index bf3aba3..efc8621 100755
+index 2ce972a..85c02ea 100755
 --- a/set_up_default_resources.py
 +++ b/set_up_default_resources.py
-@@ -121,6 +121,7 @@ class SetupArgs:
+@@ -157,12 +157,14 @@ class PathsConfig:
                                                  installed.
-         use_case_resources_file (str)       :   Path to a JSON file containing the use case
+         use_case_resources_file (Path)      :   Path to a JSON file containing the use case
                                                  metadata resources.
 +        downloaded_model_resources_path (str): Path to store model resources files.
+ 
+         downloads_dir (Path)                :  Path to store model resources files.
      """
-     run_vela_on_models: bool = False
-     additional_npu_config_names: typing.List[str] = ()
-@@ -129,6 +130,7 @@ class SetupArgs:
-     check_clean_folder: bool = False
      additional_requirements_file: Path = ""
      use_case_resources_file: Path = ""
+     downloads_dir: Path = ""
 +    downloaded_model_resources_path: Path = ""
 
 
  def load_use_case_resources(
-@@ -646,8 +648,7 @@ def set_up_resources(args: SetupArgs) -> Path:
+@@ -678,7 +680,7 @@ def set_up_resources(setup_config: SetupConfig, paths_config: PathsConfig) -> Pa
      """
      # Paths.
-     current_file_dir = Path(__file__).parent.resolve()
--    download_dir = current_file_dir / "resources_downloaded"
--    metadata_file_path = download_dir / "resources_downloaded_metadata.json"
-+    metadata_file_path = args.downloaded_model_resources_path / "resources_downloaded_metadata.json"
+     check_paths_config(paths_config)
+-    metadata_file_path = paths_config.downloads_dir / "resources_downloaded_metadata.json"
++    metadata_file_path = paths_config.downloaded_model_resources_path / "resources_downloaded_metadata.json"
 
      # Is Python minimum requirement matched?
      if sys.version_info < py3_version_minimum:
-@@ -664,14 +665,14 @@ def set_up_resources(args: SetupArgs) -> Path:
+@@ -695,14 +697,14 @@ def set_up_resources(setup_config: SetupConfig, paths_config: PathsConfig) -> Pa
      setup_script_hash = get_md5sum_for_file(Path(__file__).resolve())
 
      metadata_dict, setup_script_hash_verified = initialize_resources_directory(
--        download_dir,
-+        args.downloaded_model_resources_path,
-         args.check_clean_folder,
+-        paths_config.downloads_dir,
++        paths_config.downloaded_model_resources_path,
+         setup_config.check_clean_folder,
          metadata_file_path,
          setup_script_hash
      )
 
      env_path, env_activate = set_up_python_venv(
--        download_dir,
-+        args.downloaded_model_resources_path,
-         args.additional_requirements_file
+-        paths_config.downloads_dir,
++        paths_config.downloaded_model_resources_path,
+         paths_config.additional_requirements_file
      )
 
-@@ -681,7 +682,7 @@ def set_up_resources(args: SetupArgs) -> Path:
+@@ -712,7 +714,7 @@ def set_up_resources(setup_config: SetupConfig, paths_config: PathsConfig) -> Pa
          download_resources(
              use_case,
              metadata_dict,
--            download_dir,
-+            args.downloaded_model_resources_path,
-             args.check_clean_folder,
+-            paths_config.downloads_dir,
++            paths_config.downloaded_model_resources_path,
+             setup_config.check_clean_folder,
              setup_script_hash_verified
          )
-@@ -698,7 +699,7 @@ def set_up_resources(args: SetupArgs) -> Path:
+@@ -728,7 +730,7 @@ def set_up_resources(setup_config: SetupConfig, paths_config: PathsConfig) -> Pa
+     if setup_config.run_vela_on_models is True:
          # Consolidate all config names while discarding duplicates:
          run_vela_on_all_models(
-             current_file_dir,
--            download_dir,
-+            args.downloaded_model_resources_path,
+-            paths_config.downloads_dir,
++            paths_config.downloaded_model_resources_path,
              env_activate,
-             args.arena_cache_size,
+             setup_config.arena_cache_size,
              npu_config_names=list(
-@@ -763,7 +764,12 @@ if __name__ == "__main__":
-         type=str,
-         default=default_use_case_resources_path
+@@ -799,6 +801,12 @@ if __name__ == "__main__":
+         type=Path,
+         default=default_downloads_path
      )
--
 +    parser.add_argument(
-+         "--downloaded-model-resources-path",
++        "--downloaded-model-resources-path",
 +        help="Path to downloaded model resources",
 +        type=Path,
 +        default=Path(__file__).parent.resolve() / 'resources_downloaded'
 +    )
+ 
      parsed_args = parser.parse_args()
 
-     if parsed_args.arena_cache_size < 0:
-@@ -783,6 +789,7 @@ if __name__ == "__main__":
-         check_clean_folder=parsed_args.clean,
-         additional_requirements_file=parsed_args.requirements_file,
+@@ -823,6 +831,7 @@ if __name__ == "__main__":
          use_case_resources_file=parsed_args.use_case_resources_file,
-+        downloaded_model_resources_path= parsed_args.downloaded_model_resources_path,
+         downloads_dir=parsed_args.downloads_dir,
+         additional_requirements_file=parsed_args.requirements_file,
++        downloaded_model_resources_path=parsed_args.downloaded_model_resources_path,
      )
 
-     set_up_resources(setup_args)
+     set_up_resources(setup, paths)
 -- 
 2.34.1
 

components/ai/ml_embedded_evaluation_kit/integration/patches/0003-Make-ETHOSU_ARCH-configurable-in-TensorFlow-CMake.patch

@@ -0,0 +1,33 @@
+From c5c0bdff764cde7db2c97761a5eff15f55a09dbb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gergely=20Korcs=C3=A1k?= <[email protected]>
+Date: Thu, 8 Aug 2024 17:47:54 +0200
+Subject: [PATCH] Make ETHOSU_ARCH configurable in TensorFlow CMake
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Gergely Korcsák <[email protected]>
+---
+ scripts/cmake/tensorflow_lite_micro.cmake | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/scripts/cmake/tensorflow_lite_micro.cmake b/scripts/cmake/tensorflow_lite_micro.cmake
+index 4a988aa..1640626 100644
+--- a/scripts/cmake/tensorflow_lite_micro.cmake
++++ b/scripts/cmake/tensorflow_lite_micro.cmake
+@@ -75,11 +75,7 @@ else()
+     if(ETHOS_U_NPU_ENABLED)
+         # Arm Ethos-U55 NPU is the co-processor for ML workload:
+         set(TENSORFLOW_LITE_MICRO_CO_PROCESSOR      "ethos_u")
+-        if(${ETHOS_U_NPU_ID} STREQUAL "U65")
+-            set(TENSORFLOW_LITE_MICRO_CO_PROCESSOR_ARCH "u65")
+-        else()
+-            set(TENSORFLOW_LITE_MICRO_CO_PROCESSOR_ARCH "u55")
+-        endif ()
++        string(TOLOWER "${ETHOS_U_NPU_ID}" TENSORFLOW_LITE_MICRO_CO_PROCESSOR_ARCH)
+     endif()
+ 
+     set(TENSORFLOW_LITE_MICRO_OPTIMIZED_KERNEL  "cmsis_nn")
+-- 
+2.34.1
+

components/ai/ml_embedded_evaluation_kit/integration/patches/0004-Patch-tensorflow.patch

@@ -0,0 +1,31 @@
+From 2352b60b03042fc9ea2d9cf9ce861d8e87341e32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gergely=20Korcs=C3=A1k?= <[email protected]>
+Date: Mon, 12 Aug 2024 15:43:48 +0200
+Subject: [PATCH] Patch tensorflow
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Gergely Korcsák <[email protected]>
+---
+ tensorflow/lite/micro/tools/make/ext_libs/ethos_u.inc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tensorflow/lite/micro/tools/make/ext_libs/ethos_u.inc b/tensorflow/lite/micro/tools/make/ext_libs/ethos_u.inc
+index c61aaff3..81066237 100644
+--- a/tensorflow/lite/micro/tools/make/ext_libs/ethos_u.inc
++++ b/tensorflow/lite/micro/tools/make/ext_libs/ethos_u.inc
+@@ -64,6 +64,10 @@ else ifeq ($(ETHOSU_ARCH), u65)
+   ETHOSU_FLAGS += \
+     -DETHOSU_ARCH=u65 \
+     -DETHOSU65
++else ifeq ($(ETHOSU_ARCH), u85)
++  ETHOSU_FLAGS += \
++    -DETHOSU_ARCH=u85 \
++    -DETHOSU85
+ else
+   $(error "ETHOSU_ARCH=$(ETHOSU_ARCH) is not supported")
+ endif
+-- 
+2.34.1
+