diff --git a/backends/arm/scripts/mlsdk_utils.sh b/backends/arm/scripts/mlsdk_utils.sh index 95aa5cf2a4f..87fc206fe4a 100755 --- a/backends/arm/scripts/mlsdk_utils.sh +++ b/backends/arm/scripts/mlsdk_utils.sh @@ -9,7 +9,7 @@ set -euo pipefail # URL and tag of the MLSDK manifest repository. Can be overridden by environment variables. # eg. export MLSDK_MANIFEST_URL=...; export MLSDK_MANIFEST_TAG=... mlsdk_manifest_url="${MLSDK_MANIFEST_URL:-https://github.com/arm/ai-ml-sdk-manifest.git}" -mlsdk_manifest_tag="${MLSDK_MANIFEST_TAG:-refs/tags/v2025.10.0}" +mlsdk_manifest_tag="${MLSDK_MANIFEST_TAG:-refs/tags/v2025.12.0}" script_dir=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd) @@ -37,13 +37,6 @@ function mlsdk_sync_manifest() { local default_manifest=".repo/manifests/default.xml" - # TODO: Remove this workaround once 2GB capable mlir translator is available - # in the official MLSDK repository. - if [[ "${OSTYPE:-}" == darwin* ]]; then - sed -i '' 's|revision="refs/tags/v2025.07.1"|revision="c3b324e643b4b4e592de8a9123a58c4179649d8c"|' "${default_manifest}" - else - sed -i 's|revision="refs/tags/v2025.07.1"|revision="c3b324e643b4b4e592de8a9123a58c4179649d8c"|' "${default_manifest}" - fi ./repo sync --force-sync -j"${parallel_jobs}" popd @@ -120,6 +113,16 @@ function download_ai_mlsdk_manifest() { git -C "${_manifest_dir}/.repo/manifests" clean -fd >/dev/null 2>&1 || true fi + # Going from v2025.10.0 to v2025.12.0 seems particular hard so just keep it simple. + # TODO: Remove once this is history + if [[ "${cached_tag}" == "refs/tags/v2025.10.0" ]] && [[ "${mlsdk_manifest_tag}" == "refs/tags/v2025.12.0" ]]; then + pushd "${_manifest_dir}/.." + log_step "mlsdk" "Deleting ${mlsdk_manifest_dir} and starting fresh" + manifest_base_dir=$(basename "${_manifest_dir}") + rm -fr $manifest_base_dir + popd + fi + mlsdk_sync_manifest "${_manifest_dir}" } diff --git a/backends/arm/tosa/backend.py b/backends/arm/tosa/backend.py index 913b5207767..cb67d122ddf 100644 --- a/backends/arm/tosa/backend.py +++ b/backends/arm/tosa/backend.py @@ -226,7 +226,7 @@ def _preprocess( # noqa: C901 if not ( tosa_spec.version.major == ts.TOSA_VERSION_MAJOR - and tosa_spec.version.minor == ts.TOSA_VERSION_MINOR + and tosa_spec.version.minor <= ts.TOSA_VERSION_MINOR ): raise RuntimeError( f"TOSA serializer version " diff --git a/examples/arm/setup.sh b/examples/arm/setup.sh index b36dd0f5c04..b4813beff52 100755 --- a/examples/arm/setup.sh +++ b/examples/arm/setup.sh @@ -345,9 +345,8 @@ if [[ $is_script_sourced -eq 0 ]]; then fi pushd tosa-tools - git fetch origin main - git checkout 8468d041c50c6d806f3c1c18c66d7ef641e46580 # serialization lib pybindings - git cherry-pick 368f0cd745b2a1569bf36f077daeba95775de192 # perf fix for >2gb models + git checkout v2025.11.0 + if [[ ! -d "reference_model" ]]; then log_step "main" "[error] Missing reference_model directory in tosa-tools repo." exit 1