ml-eval-kit: Remove default NPU config list patch

Use the -additional-ethos-u-config-name option to generate required NPU optimization instead of patching default list. Signed-off-by: Gabor Abonyi <[email protected]>
FreeRTOS · Feb 6, 2024 · 068a167 · 068a167
1 parent 2d6b7d0
commit 068a167
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/...onents/ai/ml_embedded_evaluation_kit/integration/cmake/BuildMlEmbeddedEvaluationKit.cmake b/...onents/ai/ml_embedded_evaluation_kit/integration/cmake/BuildMlEmbeddedEvaluationKit.cmake
@@ -37,10 +37,13 @@ ExternalProject_Add(
         ${CMAKE_COMMAND} --build <BINARY_DIR> --target ${ML_TARGETS}
 )
 
+set(ML_RESOURCES_SET_UP_ARGS
+    "--additional-ethos-u-config-name=${ETHOSU_TARGET_NPU_CONFIG}"
+)
 ExternalProject_Add_Step(ml_embedded_evaluation_kit-build
     download_model
     COMMAND
-        python3 ${ml_embedded_evaluation_kit_SOURCE_DIR}/set_up_default_resources.py
+        python3 ${ml_embedded_evaluation_kit_SOURCE_DIR}/set_up_default_resources.py ${ML_RESOURCES_SET_UP_ARGS}
     DEPENDERS
         configure
     USES_TERMINAL ON

diff --git a/...n_kit/integration/patches/0001-resources-Replace-model-wav2letter-with-tiny_wav2let.patch b/...n_kit/integration/patches/0001-resources-Replace-model-wav2letter-with-tiny_wav2let.patch
@@ -63,15 +63,6 @@ index b442432..a0d6149 100755
              },
              {
                  "sub_folder": "asr",
-@@ -235,7 +235,7 @@ valid_npu_config_names = [
- ]
-
- # Default NPU configurations (these are always run when the models are optimised)
--default_npu_config_names = [valid_npu_config_names[2], valid_npu_config_names[4]]
-+default_npu_config_names = [valid_npu_config_names[2], valid_npu_config_names[3], valid_npu_config_names[4]]
-
- # NPU config named tuple
- NPUConfig = namedtuple(
 diff --git a/source/use_case/asr/usecase.cmake b/source/use_case/asr/usecase.cmake
 index fc3f2b5..3ce2c0a 100644
 --- a/source/use_case/asr/usecase.cmake