Merge branch 'release/1.1' into android-1.1.0-rc1

Author: kirklandsign

.ci/docker/common/install_pytorch.sh

@@ -12,12 +12,11 @@ source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
 install_domains() {
   echo "Install torchvision and torchaudio"
-  pip_install --no-build-isolation --user "git+https://github.com/pytorch/audio.git@${TORCHAUDIO_VERSION}"
-  pip_install --no-build-isolation --user "git+https://github.com/pytorch/vision.git@${TORCHVISION_VERSION}"
+  pip_install --force-reinstall torchvision==0.25.0 torchaudio==2.10.0 --index-url https://download.pytorch.org/whl/cpu
 }
 
 install_pytorch_and_domains() {
-  pip_install --force-reinstall torch==2.10.0 torchvision==0.25.0 torchaudio==2.10.0 torchao==0.15.0 --index-url https://download.pytorch.org/whl/test/cpu
+  pip_install --force-reinstall torch==2.10.0 torchvision==0.25.0 torchaudio==2.10.0 torchao==0.15.0 --index-url https://download.pytorch.org/whl/cpu
 }
 
 install_pytorch_and_domains

.ci/scripts/benchmark_tooling/get_benchmark_analysis_data.py

@@ -104,7 +104,7 @@ class BenchmarkFilters:
 
 BASE_URLS = {
     "local": "http://localhost:3000",
-    "prod": "https://hud.pytorch.org",
+    "prod": "https://hud.pytorch.org",  # @lint-ignore
 }
 
 

.ci/scripts/setup-linux.sh

@@ -17,12 +17,8 @@ echo "Build tool: $BUILD_TOOL, Mode: $BUILD_MODE"
 # have already been installed, so we use PyTorch build from source here instead
 # of nightly. This allows CI to test against latest commits from PyTorch
 if [[ "${EDITABLE:-false}" == "true" ]]; then
-  install_executorch --use-pt-pinned-commit --editable
+  install_executorch --editable
 else
-  install_executorch --use-pt-pinned-commit
+  install_executorch
 fi
 build_executorch_runner "${BUILD_TOOL}" "${BUILD_MODE}"
-
-if [[ "${GITHUB_BASE_REF:-}" == *main* || "${GITHUB_BASE_REF:-}" == *gh* ]]; then
-  do_not_use_nightly_on_ci
-fi

.ci/scripts/test_lora.sh

@@ -117,18 +117,18 @@ else
   echo "Expected result prefix: ${EXPECTED_PREFIX}"
   echo "Actual result: ${RESULT}"
   echo "Test 2: Failure; results not the same"
-#   cleanup_files
+  cleanup_files
   exit 1
 fi
 
 # Confirm file sizes.
 FOUNDATION_SIZE=$(stat -c%s qwen_foundation.ptd)
 if [[ $FOUNDATION_SIZE -le "2400000000" ]]; then
-    echo "qwen_foundation_q.ptd size is: $FOUNDATION_SIZE"
+  echo "qwen_foundation_q.ptd size is: $FOUNDATION_SIZE"
 else
-    echo "qwen_foundation_q.ptd size: $FOUNDATION_SIZE is greater than threshold 2.4GB"
-    cleanup_files
-    exit 1
+  echo "qwen_foundation_q.ptd size: $FOUNDATION_SIZE is greater than threshold 2.4GB"
+  cleanup_files
+  exit 1
 fi
 
 ### QUANTIZATION & PROGRAM DATA SEPARATION ###
@@ -161,13 +161,19 @@ $PYTHON_EXECUTABLE -m extension.llm.export.export_llm \
     +quantization.qmode="8da4w" \
     +quantization.group_size=32
 
-# Confirm that qwen_foundation_lora_q.ptd and qwen_foundation_q.ptd are the same.
-if diff -q qwen_foundation_lora_q.ptd qwen_foundation_q.ptd > /dev/null; then
-    echo "qwen_foundation_lora_q.ptd and qwen_foundation_q.ptd are identical."
+# Confirm that qwen_foundation_lora_q.ptd and qwen_foundation_q.ptd are the same size.
+# TODO(lfq): confirm they are the same (deserialize and check fields)
+size1=$(stat -c%s qwen_foundation_lora_q.ptd)
+size2=$(stat -c%s qwen_foundation_q.ptd)
+
+if [ "$size1" -eq "$size2" ]; then
+  echo "qwen_foundation_lora_q.ptd and qwen_foundation_q.ptd are the same size: $size1."
 else
-    echo "qwen_foundation_lora_q.ptd and qwen_foundation_q.ptd are not identical."
-    cleanup_files
-    exit 1
+  echo "qwen_foundation_lora_q.ptd and qwen_foundation_q.ptd have different sizes."
+  ls -la qwen_foundation_lora_q.ptd
+  ls -la qwen_foundation_q.ptd
+  cleanup_files
+  exit 1
 fi
 
 # Run quantized qwen model (no adapter).
@@ -214,11 +220,11 @@ fi
 # Confirm qwen_foundation_q.ptd file size.
 FOUNDATION_Q_SIZE=$(stat -c%s qwen_foundation_q.ptd)
 if [[ $FOUNDATION_Q_SIZE -le "1000000000" ]]; then
-    echo "qwen_foundation_q.ptd size is: $FOUNDATION_Q_SIZE"
+  echo "qwen_foundation_q.ptd size is: $FOUNDATION_Q_SIZE"
 else
-    echo "qwen_foundation_q.ptd size: $FOUNDATION_Q_SIZE is greater than threshold 1GB"
-    cleanup_files
-    exit 1
+  echo "qwen_foundation_q.ptd size: $FOUNDATION_Q_SIZE is greater than threshold 1GB"
+  cleanup_files
+  exit 1
 fi
 
 cleanup_files

.ci/scripts/test_wheel_package_qnn.sh

@@ -139,25 +139,12 @@ run_core_tests () {
   echo "=== [$LABEL] Installing wheel & deps ==="
   "$PIPBIN" install --upgrade pip
   "$PIPBIN" install "$WHEEL_FILE"
-  TORCH_VERSION=$(
-  "$PYBIN" - <<'PY'
-import runpy
-module_vars = runpy.run_path("torch_pin.py")
-print(module_vars["TORCH_VERSION"])
-PY
-)
+  TORCH_VERSION=2.10.0
 
-  NIGHTLY_VERSION=$(
-  "$PYBIN" - <<'PY'
-import runpy
-module_vars = runpy.run_path("torch_pin.py")
-print(module_vars["NIGHTLY_VERSION"])
-PY
-)
-  echo "=== [$LABEL] Install torch==${TORCH_VERSION}.${NIGHTLY_VERSION} ==="
+  echo "=== [$LABEL] Install torch==${TORCH_VERSION} ==="
 
   # Install torchao based on the pinned PyTorch version
-  "$PIPBIN" install torch=="${TORCH_VERSION}.${NIGHTLY_VERSION}" --index-url "https://download.pytorch.org/whl/nightly/cpu"
+  "$PIPBIN" install torch=="${TORCH_VERSION}"
   "$PIPBIN" install wheel
 
   # Install torchao based on the pinned commit from third-party/ao submodule

.ci/scripts/tests/test_get_benchmark_analysis_data.py

@@ -179,7 +179,9 @@ def setUp(self):
     def test_init(self):
         """Test initialization of ExecutorchBenchmarkFetcher."""
         self.assertEqual(self.fetcher.env, "prod")
-        self.assertEqual(self.fetcher.base_url, "https://hud.pytorch.org")
+        self.assertEqual(
+            self.fetcher.base_url, "https://hud.pytorch.org"  # @lint-ignore
+        )
         self.assertEqual(
             self.fetcher.query_group_table_by_fields,
             ["model", "backend", "device", "arch"],
@@ -193,7 +195,9 @@ def test_init(self):
 
     def test_get_base_url(self):
         """Test _get_base_url method."""
-        self.assertEqual(self.fetcher._get_base_url(), "https://hud.pytorch.org")
+        self.assertEqual(
+            self.fetcher._get_base_url(), "https://hud.pytorch.org"  # @lint-ignore
+        )
 
         # Test with local environment
         local_fetcher = self.module.ExecutorchBenchmarkFetcher(env="local")

CONTRIBUTING.md

@@ -26,7 +26,7 @@ executorch
 │   ├── <a href="backends/apple">apple</a> - Apple-specific backends.
 │   │   ├── <a href="backends/apple/coreml">coreml</a> - CoreML backend for Apple devices. See <a href="docs/source/backends/coreml/coreml-overview.md">doc</a>.
 │   │   └── <a href="backends/apple/mps">mps</a> - Metal Performance Shaders backend for Apple devices. See <a href="docs/source/backends/mps/mps-overview.md">doc</a>.
-│   ├── <a href="backends/arm">arm</a> - ARM architecture backends. See <a href="docs/source/backends-arm-ethos-u.md">doc</a>.
+│   ├── <a href="backends/arm">arm</a> - ARM architecture backends. See <a href="docs/source/backends/arm-ethos-u/arm-ethos-u-overview.md">doc</a>.
 │   ├── <a href="backends/cadence">cadence</a> - Cadence-specific backends. See <a href="docs/source/backends-cadence.md">doc</a>.
 │   ├── <a href="backends/example">example</a> - Example backend implementations.
 │   ├── <a href="backends/mediatek">mediatek</a> - MediaTek-specific backends. See <a href="docs/source/backends-mediatek.md">doc</a>.
@@ -324,7 +324,8 @@ the code you're modifying and find an author who has more context. Ask them
 for their help in the PR comments.
 
 ### Continuous Integration
-See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of
+
+See https://hud.pytorch.org/hud/pytorch/executorch/main for the current state of <!-- @lint-ignore -->
 the CI (continuous integration) jobs. If `main` is broken, consider rebasing
 your PR onto the `release/1.1` branch, which points to the most recent
 all-green commit.

backends/arm/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2023, 2025 Arm Limited and/or its affiliates.
+# Copyright 2023, 2025-2026 Arm Limited and/or its affiliates.
 #
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
@@ -52,10 +52,8 @@ if(EXECUTORCH_BUILD_VGF)
   set(VULKAN_HEADERS_PATH ${VULKAN_THIRD_PARTY_PATH}/Vulkan-Headers/include)
   set(VOLK_HEADERS_PATH ${VULKAN_THIRD_PARTY_PATH}/volk)
 
-  if(APPLE
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$"
-     OR EXISTS
-        "${EXECUTORCH_ROOT}/examples/arm/arm-scratch/ml-sdk-for-vulkan-manifest/"
+  if(EXISTS
+     "${EXECUTORCH_ROOT}/examples/arm/arm-scratch/ml-sdk-for-vulkan-manifest/"
   )
     message(STATUS "libvgf sourced from local scratch tree")
 

backends/arm/requirements-arm-vgf.txt

@@ -1,8 +1,8 @@
-# Copyright 2025 Arm Limited and/or its affiliates.
+# Copyright 2025-2026 Arm Limited and/or its affiliates.
 #
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-ai_ml_emulation_layer_for_vulkan == 0.7.0
-ai_ml_sdk_model_converter == 0.7.0
-ai_ml_sdk_vgf_library == 0.7.0
+ai_ml_emulation_layer_for_vulkan == 0.8.0
+ai_ml_sdk_model_converter == 0.8.0
+ai_ml_sdk_vgf_library == 0.8.0

backends/openvino/quantizer/quantizer.py

@@ -295,7 +295,7 @@ def _get_unified_scales_root_quantizer_id(
         """
         Identifies the earliest quantizer node ID based on the corresponding `nncf_node.node_id`
         in the given NNCFGraph. This is required by the `_get_obs_or_fq_map` function.
-        Refer to: https://github.com/pytorch/pytorch/blob/main/torch/ao/quantization/pt2e/prepare.py#L291
+        Refer to: https://github.com/pytorch/ao/blob/main/torchao/quantization/pt2e/prepare.py
 
         :param nncf_graph: The NNCFGraph instance.
         :param quantizer_ids: The list of quantizer IDs to evaluate.