From a08c124d46fc894c20738ba873b54a1051b6c5e3 Mon Sep 17 00:00:00 2001 From: Ahmed Ismail Date: Mon, 17 Mar 2025 15:48:33 +0000 Subject: [PATCH 1/3] setuptools: Update to latest version The current version of setuptools (59.6.0) is too old to meet the requirements of the packages installed during the pre-commit stage. To avoid conflicts with system packages, a virtual environment was used to do so. Signed-off-by: Ahmed Ismail --- tools/ci/pipeline-baseline-fri.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/ci/pipeline-baseline-fri.yml b/tools/ci/pipeline-baseline-fri.yml index 8d1ca3be..2e7cd4e0 100644 --- a/tools/ci/pipeline-baseline-fri.yml +++ b/tools/ci/pipeline-baseline-fri.yml @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Arm Limited and/or its affiliates +# Copyright 2021-2025 Arm Limited and/or its affiliates # # SPDX-License-Identifier: MIT @@ -44,6 +44,10 @@ pre-commit: - .base-job-rules stage: quality-check script: + - python3 -m venv venv + - source venv/bin/activate + - pip install --upgrade pip setuptools + - pip install PyYAML click typing - pip install tools/ci -t $PWD - apt-get update -y - apt-get install fd-find -y From 5afcc63ffd118ab4c333e56f78f8f1dcb6022365 Mon Sep 17 00:00:00 2001 From: Ahmed Ismail Date: Wed, 19 Mar 2025 14:25:29 +0000 Subject: [PATCH 2/3] mlek: Switch to public GitLab repo Ml-Embedded-Evaluation-kit GitLab repos are now live and public. Hence switching to using them. Changes done in this commit: * Update the submodule for MLEK to use the public GitLab instance. * Update the docs to refer to the public MLEK GitLab instance. Signed-off-by: Ahmed Ismail --- .gitmodules | 2 +- .../ai/ml_embedded_evaluation_kit/integration/README.md | 4 ++-- .../integration/cmake/model/GenerateASRModel.cmake | 4 ++-- .../integration/cmake/model/GenerateKWSModel.cmake | 4 ++-- .../cmake/model/GenerateObjectDetectionModel.cmake | 4 ++-- manifest.yml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index e50e236a..3e48c0be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -51,7 +51,7 @@ url = https://github.com/ThrowTheSwitch/Unity.git [submodule "ml_embedded_evaluation_kit"] path = components/ai/ml_embedded_evaluation_kit/library - url = https://review.mlplatform.org/ml/ethos-u/ml-embedded-evaluation-kit.git + url = https://git.gitlab.arm.com/artificial-intelligence/ethos-u/ml-embedded-evaluation-kit.git [submodule "speexdsp"] path = components/ai/speexdsp/library url = https://gitlab.xiph.org/xiph/speexdsp.git diff --git a/components/ai/ml_embedded_evaluation_kit/integration/README.md b/components/ai/ml_embedded_evaluation_kit/integration/README.md index 4db63d7a..f4b8073d 100644 --- a/components/ai/ml_embedded_evaluation_kit/integration/README.md +++ b/components/ai/ml_embedded_evaluation_kit/integration/README.md @@ -35,6 +35,6 @@ This is provided to the build system by setting the path to the JSON file with t For more information about the ML Embedded Evaluation Kit, see the [ML Embedded Evaluation Kit documentation]. -[Build options]: https://review.mlplatform.org/plugins/gitiles/ml/ethos-u/ml-embedded-evaluation-kit/+/HEAD/docs/sections/building.md#build-options +[Build options]: https://gitlab.arm.com/artificial-intelligence/ethos-u/ml-embedded-evaluation-kit/-/blob/main/docs/sections/building.md#build-options [SetupMlEmbeddedEvaluationKitLibraries.cmake]: ../../../../components/ai/ml_embedded_evaluation_kit/integration/cmake/SetupMlEmbeddedEvaluationKitLibraries.cmake -[ML Embedded Evaluation Kit documentation]: https://review.mlplatform.org/plugins/gitiles/ml/ethos-u/ml-embedded-evaluation-kit/+/HEAD/docs/documentation.md +[ML Embedded Evaluation Kit documentation]: https://gitlab.arm.com/artificial-intelligence/ethos-u/ml-embedded-evaluation-kit/-/blob/main/docs/documentation.md diff --git a/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateASRModel.cmake b/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateASRModel.cmake index 3450a150..d9fe82f2 100644 --- a/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateASRModel.cmake +++ b/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateASRModel.cmake @@ -1,5 +1,5 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021-2024 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: Copyright 2021-2025 Arm Limited and/or its affiliates # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #---------------------------------------------------------------------------- -# This file is based on https://review.mlplatform.org/plugins/gitiles/ml/ethos-u/ml-embedded-evaluation-kit/+/refs/tags/23.08/source/use_case/asr/usecase.cmake +# This file is based on https://gitlab.arm.com/artificial-intelligence/ethos-u/ml-embedded-evaluation-kit/-/blob/23.08/source/use_case/asr/usecase.cmake set(ASR_LABELS_TXT_FILE ${ml_embedded_evaluation_kit_SOURCE_DIR}/resources/asr/labels/labels_wav2letter.txt) diff --git a/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateKWSModel.cmake b/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateKWSModel.cmake index 641d2033..9d7cb541 100644 --- a/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateKWSModel.cmake +++ b/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateKWSModel.cmake @@ -1,5 +1,5 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021-2024 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: Copyright 2021-2025 Arm Limited and/or its affiliates # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #---------------------------------------------------------------------------- -# This file is based on https://review.mlplatform.org/plugins/gitiles/ml/ethos-u/ml-embedded-evaluation-kit/+/refs/tags/23.08/source/use_case/kws/usecase.cmake +# This file is based on https://gitlab.arm.com/artificial-intelligence/ethos-u/ml-embedded-evaluation-kit/-/blob/23.08/source/use_case/kws/usecase.cmake set(KWS_LABELS_TXT_FILE ${ml_embedded_evaluation_kit_SOURCE_DIR}/resources/kws/labels/micronet_kws_labels.txt) diff --git a/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateObjectDetectionModel.cmake b/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateObjectDetectionModel.cmake index 0d44dd86..3b17918f 100644 --- a/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateObjectDetectionModel.cmake +++ b/components/ai/ml_embedded_evaluation_kit/integration/cmake/model/GenerateObjectDetectionModel.cmake @@ -1,5 +1,5 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021-2024 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: Copyright 2021-2025 Arm Limited and/or its affiliates # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #---------------------------------------------------------------------------- -# This file is based on https://review.mlplatform.org/plugins/gitiles/ml/ethos-u/ml-embedded-evaluation-kit/+/refs/tags/23.11/source/use_case/object_detection/usecase.cmake +# This file is based on https://gitlab.arm.com/artificial-intelligence/ethos-u/ml-embedded-evaluation-kit/-/blob/23.08/source/use_case/object_detection/usecase.cmake set(OBJECT_DETECTION_IMAGE_SIZE 192) set(OBJECT_DETECTION_ANCHOR_1 "{38, 77, 47, 97, 61, 126}") diff --git a/manifest.yml b/manifest.yml index 4aa11fd9..97d158e7 100644 --- a/manifest.yml +++ b/manifest.yml @@ -172,7 +172,7 @@ dependencies: version: "ddb3ffdbcfc6f66dc3906e84158f235824536b4a" repository: type: "git" - url: "https://review.mlplatform.org/ml/ethos-u/ml-embedded-evaluation-kit.git" + url: "https://git.gitlab.arm.com/artificial-intelligence/ethos-u/ml-embedded-evaluation-kit.git" path: "components/ai/ml_embedded_evaluation_kit/library" - name: "speexdsp" license: "BSD-3-Clause" From 03dd4f61f83b15da9abecbf98730d93155b946bf Mon Sep 17 00:00:00 2001 From: Ahmed Ismail Date: Tue, 18 Mar 2025 17:18:41 +0000 Subject: [PATCH 3/3] run-script: Fix conflicts with DISPLAY system wide variable `DISPLAY` is a well-known system-wide variable used in Linux for GUI applications. Overwriting it in the script could lead to unintended side effects, especially when launching graphical applications. Renaming it to HDLCD_GUI to avoid such conflicts. Signed-off-by: Ahmed Ismail --- release_changes/202503181254.change.md | 3 +++ tools/scripts/run.sh | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 release_changes/202503181254.change.md diff --git a/release_changes/202503181254.change.md b/release_changes/202503181254.change.md new file mode 100644 index 00000000..ab2c156f --- /dev/null +++ b/release_changes/202503181254.change.md @@ -0,0 +1,3 @@ +run-script: Fix conflicts with DISPLAY system wide variable. +mlek: Switch to public GitLab repo +setuptools: Update to latest version diff --git a/tools/scripts/run.sh b/tools/scripts/run.sh index 0a9a9f43..b5e04bcd 100755 --- a/tools/scripts/run.sh +++ b/tools/scripts/run.sh @@ -14,8 +14,8 @@ NPU_ID="" FVP_BIN="FVP_Corstone_SSE-320" FRAMES="" OPTIONS="" -DISPLAY=true -DISPLAY_OPTIONS="" +HDLCD_GUI=false +HDLCD_GUI_OPTIONS="" set -e @@ -33,15 +33,15 @@ Options: -n,--npu-id NPU ID to use (U55, U65) -f,--frames Path to camera frames for the ISP to stream -d,--debug Path to debugger plugin to start FVP - -D,--display Is display (GUI) available + -G,--gui Is HDLCD GUI enabled Examples: blinky, keyword-detection, speech-recognition, object-detection EOF } -SHORT=t:,n:,s:,h,p:,f:,d:,D: -LONG=target:,npu-id:,audio:,help,path:,frames:,debug:,display: +SHORT=t:,n:,s:,h,p:,f:,d:,G: +LONG=target:,npu-id:,audio:,help,path:,frames:,debug:,gui: OPTS=$(getopt -n run --options $SHORT --longoptions $LONG -- "$@") eval set -- "$OPTS" @@ -81,8 +81,8 @@ do fi shift 2 ;; - -D | --display ) - DISPLAY=$2 + -G | --gui ) + HDLCD_GUI=$2 shift 2 ;; --) @@ -185,8 +185,8 @@ if [ -f "$GDB_PLUGIN" ]; then OPTIONS="--allow-debug-plugin --plugin $GDB_PLUGIN" fi -if [ "$DISPLAY" = false ]; then - DISPLAY_OPTIONS="-C vis_hdlcd.disable_visualisation=1" +if [ "$HDLCD_GUI" = false ]; then + HDLCD_GUI_OPTIONS="-C vis_hdlcd.disable_visualisation=1" fi case "$TARGET" in @@ -203,7 +203,7 @@ case "$TARGET" in -C mps3_board.DISABLE_GATING=1" ;; corstone315 | corstone320 ) - OPTIONS="$OPTIONS $DISPLAY_OPTIONS \ + OPTIONS="$OPTIONS $HDLCD_GUI_OPTIONS \ -C mps4_board.visualisation.disable-visualisation=1 \ -C core_clk.mul=200000000 \ -C mps4_board.smsc_91c111.enabled=1 \