components: Bump MLEK version to 25.05

The goal of this commit is to update
ML-Embedded-Evaluation-Kit library to
version 25.05 which includes switching
to CMSIS6 from CMSIS5.

Signed-off-by: Daniel Velez <[email protected]>
Signed-off-by: Ahmed Ismail <[email protected]>

Author: Daniel Velez

.github/.cSpellWords.txt

@@ -33,6 +33,7 @@ cmos
 CMSDK
 cmsis
 CMSIS
+CMSISDSP
 CMSIS's
 COEF
 coef

applications/keyword_detection/CMakeLists.txt

@@ -94,18 +94,18 @@ target_include_directories(keyword-detection
 if(${AUDIO_SOURCE} STREQUAL "ROM")
     iot_reference_arm_corstone3xx_convert_audio_source_to_code(
         ${CMAKE_CURRENT_LIST_DIR}/resources
-        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}
     )
 
     target_sources(keyword-detection
         PRIVATE
-            ${CMAKE_CURRENT_BINARY_DIR}/InputFiles.cc
-            ${CMAKE_CURRENT_BINARY_DIR}/test.cc
+            ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}/sample_files.c
+            ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}/test.c
     )
 
     target_include_directories(keyword-detection
         PRIVATE
-            ${CMAKE_CURRENT_BINARY_DIR}
+            ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}
     )
 elseif(${AUDIO_SOURCE} STREQUAL "VSI")
     target_compile_definitions(keyword-detection

applications/keyword_detection/ml_interface.cc

@@ -103,7 +103,7 @@ extern QueueHandle_t xMlMqttQueue;
 
 #else /* !defined(AUDIO_VSI) */
 
-    #include "InputFiles.hpp"
+    #include "sample_files.h"
 
 #endif /* AUDIO_VSI */
 
@@ -739,10 +739,18 @@ static void prvProcessAudio( ApplicationContext &ctx )
                                                          ctx.Get<arm::app::KwsClassifier &>( "classifier" ),
                                                          ctx.Get<std::vector<std::string> &>( "labels" ),
                                                          singleInfResult );
+            const int16_t * pusSampleDataPtr = get_sample_data_ptr( 0 );
+            uint32_t ulSampleDataSize = get_sample_data_size( 0 );
+
+            if( ( pusSampleDataPtr == NULL ) || ( ulSampleDataSize < preProcess.m_audioDataWindowSize ) )
+            {
+                LogError( ( "No audio sample data available for inference.\r\n" ) );
+                return;
+            }
 
             /* Creating a sliding window through the whole audio clip. */
             auto audioDataSlider = audio::SlidingWindow<const int16_t>(
-                GetAudioArray( 0 ), GetAudioArraySize( 0 ), preProcess.m_audioDataWindowSize, preProcess.m_audioDataStride );
+                pusSampleDataPtr, ulSampleDataSize, preProcess.m_audioDataWindowSize, preProcess.m_audioDataStride );
 
             /* Start sliding through audio clip. */
             while( audioDataSlider.HasNext() )

applications/speech_recognition/CMakeLists.txt

@@ -88,18 +88,18 @@ target_compile_definitions(speech-recognition
 if(${AUDIO_SOURCE} STREQUAL "ROM")
     iot_reference_arm_corstone3xx_convert_audio_source_to_code(
         ${CMAKE_CURRENT_LIST_DIR}/resources
-        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}
     )
 
     target_sources(speech-recognition
         PRIVATE
-            ${CMAKE_CURRENT_BINARY_DIR}/InputFiles.cc
-            ${CMAKE_CURRENT_BINARY_DIR}/test.cc
+            ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}/sample_files.c
+            ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}/test.c
     )
 
     target_include_directories(speech-recognition
         PRIVATE
-            ${CMAKE_CURRENT_BINARY_DIR}
+            ${CMAKE_CURRENT_BINARY_DIR}/generated/${ML_USE_CASE}
     )
 elseif(${AUDIO_SOURCE} STREQUAL "VSI")
     target_compile_definitions(speech-recognition

applications/speech_recognition/dsp/src/dsp_task.cc

@@ -1,4 +1,4 @@
-/* Copyright 2023-2024 Arm Limited and/or its affiliates
+/* Copyright 2023-2025 Arm Limited and/or its affiliates
  * <[email protected]>
  * SPDX-License-Identifier: MIT
  */
@@ -118,7 +118,7 @@ extern EventGroupHandle_t xSystemEvents;
 
 #else /* !defined(AUDIO_VSI) */
 
-    #include "InputFiles.hpp"
+    #include "sample_files.h"
 
 #endif // AUDIO_VSI
 
@@ -168,12 +168,20 @@ void vDspTask( void * pvParameters )
         const int16_t * audioBuf = shared_audio_buffer;
         auto audioSource = DspAudioSource( audioBuf, AUDIO_BLOCK_NUM );
     #else
-        const int16_t * audioBuf = GetAudioArray( 0 );
+        const int16_t * audioBuf = get_sample_data_ptr( 0 );
+        uint32_t ulSampleDataSize = get_sample_data_size( 0 );
+
+        if( ( audioBuf == NULL ) || ( ulSampleDataSize < ( AUDIO_BLOCK_SIZE / sizeof( uint16_t ) ) ) )
+        {
+            LogError( ( "No audio sample data available for inference.\r\n" ) );
+            return;
+        }
+
         /* This integer division for calculating the number of blocks means that, */
         /* any remainder data at the end of the audio clip that's smaller than a */
         /* block will not be accounted for. This will not have a major impact on */
         /* the inference result as a block is only a small fraction of a second. */
-        const size_t audioBlockNum = ( size_t ) GetAudioArraySize( 0 ) / ( AUDIO_BLOCK_SIZE / sizeof( uint16_t ) );
+        const size_t audioBlockNum = ( size_t ) ulSampleDataSize / ( AUDIO_BLOCK_SIZE / sizeof( uint16_t ) );
         auto audioSource = DspAudioSource( audioBuf, audioBlockNum );
     #endif /* ifdef AUDIO_VSI */
 

components/ai/ml_embedded_evaluation_kit/CMakeLists.txt

@@ -12,14 +12,6 @@ include(ApplyPatches)
 
 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"
-    "${PATCH_FILES_DIRECTORY}/0004-Override-EthosU55-NPU-default-IRQ-handler.patch"
+    "${PATCH_FILES_DIRECTORY}/0001-Override-EthosU55-NPU-default-IRQ-handler.patch"
 )
 iot_reference_arm_corstone3xx_apply_patches("${ml_embedded_evaluation_kit_SOURCE_DIR}" "${PATCH_FILES}")
-
-set(PATCH_FILES
-    "${PATCH_FILES_DIRECTORY}/0005-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/ConvertAudioSourceToCode.cmake

@@ -1,21 +1,21 @@
-# Copyright 2023-2024 Arm Limited and/or its affiliates
+# Copyright 2023-2025 Arm Limited and/or its affiliates
 # <[email protected]>
 # SPDX-License-Identifier: MIT
 
 # Convert audio clip to C file
 function(iot_reference_arm_corstone3xx_convert_audio_source_to_code audio_path generated_path)
     add_custom_target(convert-audio
         BYPRODUCTS
-            ${generated_path}/InputFiles.cc
-            ${generated_path}/test.cc
+            ${generated_path}/sample_files.c
+            ${generated_path}/test.c
         # use ml-embedded-evaluation-kit's Python Virtual Environment which
         # contains dependencies for gen_audio_cpp.py
         COMMAND bash -c " \
             source ${CMAKE_CURRENT_BINARY_DIR}/mlek_resources_downloaded/env/bin/activate && \
+            pip install --upgrade soundfile && \
             python3 ${ml_embedded_evaluation_kit_SOURCE_DIR}/scripts/py/gen_audio_cpp.py \
             --audio_path ${audio_path} \
-            --source_folder_path ${generated_path} \
-            --header_folder_path ${generated_path} "
+            --package_gen_dir ${generated_path} "
         VERBATIM
         USES_TERMINAL
     )

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

@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Arm Limited and/or its affiliates
+# Copyright 2021-2025 Arm Limited and/or its affiliates
 # <[email protected]>
 # SPDX-License-Identifier: MIT
 
@@ -8,8 +8,7 @@ include(ExternalProject)
 # Setup for the ML target #
 ###########################
 #set(LOG_LEVEL LOG_LEVEL_TRACE)
-
-set(CMSIS_VER                   5)
+set(CMSIS_VER                   6)
 
 # External repositories
 set(CMSIS_SRC_PATH              "${ml_embedded_evaluation_kit_SOURCE_DIR}/dependencies/cmsis-${CMSIS_VER}")
@@ -26,7 +25,7 @@ set(MLEK_RESOURCES_DIR       ${CMAKE_CURRENT_BINARY_DIR}/mlek_resources_download
 set(ML_RESOURCES_SET_UP_ARGS
     "--additional-ethos-u-config-name=${ETHOSU_TARGET_NPU_CONFIG}"
     "--use-case-resources-file=${ML_USE_CASE_RESOURCES_FILE}"
-    "--downloaded-model-resources-path=${MLEK_RESOURCES_DIR}"
+    "--downloads-dir=${MLEK_RESOURCES_DIR}"
 )
 
 # Tensorflow settings
@@ -77,7 +76,7 @@ function(assert_defined var_name)
     endif()
 endfunction()
 
-include(${CMAKE_SCRIPTS_DIR}/tensorflow_lite_micro.cmake)
+add_library(cmsis_device INTERFACE)
 
 # Manually add libs
 add_subdirectory(${ml_embedded_evaluation_kit_SOURCE_DIR}/source/log ${CMAKE_BINARY_DIR}/log)
@@ -91,13 +90,26 @@ add_subdirectory(${ml_embedded_evaluation_kit_SOURCE_DIR}/source/application/api
 if (ETHOS_U_NPU_ENABLED)
     add_subdirectory(${ml_embedded_evaluation_kit_SOURCE_DIR}/source/hal/source/components/npu ${CMAKE_BINARY_DIR}/npu)
     # ethos_u_npu library needs the CPU Header (CMSIS_device_header)
+    target_include_directories(ethos_u_npu PUBLIC ${ml_embedded_evaluation_kit_SOURCE_DIR}/source/hal/source/components/cmsis_device/include)
     target_link_libraries(ethos_u_npu PUBLIC arm-corstone-platform-bsp)
 endif()
 
+include(${CMAKE_SCRIPTS_DIR}/tensorflow_lite_micro.cmake)
+target_include_directories(tflu PRIVATE
+    ${TARGET_PLATFORM_PATH}/device/include
+    ${TARGET_PLATFORM_PATH}/partition
+)
+target_compile_definitions(tflu PRIVATE
+    CMSIS_DEVICE_ARM_CORTEX_M_XX_HEADER_FILE=CMSIS_device_header
+)
+target_compile_options(tflu PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
+target_link_libraries(tflu PRIVATE arm-corstone-platform-bsp)
+
+
 # Add the dependency on tensorflow_build (defined in tensorflow.cmake)
-add_dependencies(common_api tensorflow_build)
+add_dependencies(common_api tflu)
 target_include_directories(common_api PUBLIC ${TFLITE_MICRO_PATH})
-target_compile_options(common_api PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++14>)
+target_compile_options(common_api PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
 
 # Add relevant use case API
 add_subdirectory(${ml_embedded_evaluation_kit_SOURCE_DIR}/source/application/api/use_case/${ML_USE_CASE} ${CMAKE_BINARY_DIR}/${ML_USE_CASE}_api)

components/ai/ml_embedded_evaluation_kit/integration/patches/0004-Override-EthosU55-NPU-default-IRQ-handler.patch renamed to components/ai/ml_embedded_evaluation_kit/integration/patches/0001-Override-EthosU55-NPU-default-IRQ-handler.patch

@@ -1,7 +1,7 @@
-From 1a047cff83badc2f6a95e3e78af735abef51ef8a Mon Sep 17 00:00:00 2001
+From 8ea782b063ffe69cbce26655af66382fe797378b Mon Sep 17 00:00:00 2001
 From: Ahmed Ismail <[email protected]>
-Date: Thu, 28 Nov 2024 16:14:38 +0000
-Subject: [PATCH 4/4] Override EthosU55 NPU default IRQ handler
+Date: Mon, 7 Jul 2025 12:43:51 +0100
+Subject: [PATCH] Override EthosU55 NPU default IRQ handler
 
 This change is done to avoid modifying the
 vector table by setting the Ethos U55 IRQ handler
@@ -24,7 +24,7 @@ Signed-off-by: Ahmed Ismail <[email protected]>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/source/hal/source/components/npu/ethosu_npu_init.c b/source/hal/source/components/npu/ethosu_npu_init.c
-index 2cbdb1e..1c8b4f6 100644
+index 8b74e93..c17a443 100644
 --- a/source/hal/source/components/npu/ethosu_npu_init.c
 +++ b/source/hal/source/components/npu/ethosu_npu_init.c
 @@ -71,20 +71,20 @@ static void arm_ethosu_npu_irq_init(void)