Merge branch 'main' into cuda-graph

Author: Gasoonjia

.ci/scripts/build-qnn-sdk.sh

@@ -40,6 +40,8 @@ set_up_aot() {
       -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
       -DEXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP=ON \
       -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
+      -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
+      -DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON \
       -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
       -DPYTHON_EXECUTABLE=python3
   cmake --build $PWD --target "PyQnnManagerAdaptor" -j$(nproc)

.ci/scripts/setup-qnn-deps.sh

@@ -11,4 +11,5 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../backends/qualcomm/scripts/install_q
 
 setup_libcpp 12
 setup_android_ndk
-install_qnn
+install_qnn
+pip install -r backends/qualcomm/requirements.txt

.ci/scripts/test_wheel_package_qnn.sh

@@ -177,6 +177,9 @@ PY
   "$PIPBIN" install . --no-build-isolation
   popd > /dev/null
 
+  # Install qualcomm backend dependencies  
+  "$PIPBIN" install -r "$REPO_ROOT/backends/qualcomm/requirements.txt"
+
   echo "=== [$LABEL] Import smoke tests ==="
   "$PYBIN" -c "import executorch; print('executorch imported successfully')"
   "$PYBIN" -c "import executorch.backends.qualcomm; print('executorch.backends.qualcomm imported successfully')"

.githooks/README.md

@@ -1,57 +1,63 @@
 # Git Hooks
 
-This directory contains Git hooks for the ExecuTorch repository.
+This directory contains Git hooks for the ExecuTorch repository. It is used as
+`core.hooksPath`, so git looks here instead of `.git/hooks/`.
 
-## Pre-commit Hook
+## Hooks
 
-The pre-commit hook automatically updates the PyTorch commit pin in `.ci/docker/ci_commit_pins/pytorch.txt` whenever `torch_pin.py` is modified.
+### pre-commit
 
-### How It Works
+Runs on every commit:
 
-1. When you commit changes to `torch_pin.py`, the hook detects the change
-2. It parses the `NIGHTLY_VERSION` field (e.g., `dev20251004`)
-3. Converts it to a date string (e.g., `2025-10-04`)
-4. Fetches the corresponding commit hash from the PyTorch nightly branch at https://github.com/pytorch/pytorch/tree/nightly
-5. Updates `.ci/docker/ci_commit_pins/pytorch.txt` with the new commit hash
-6. Automatically stages the updated file for commit
+1. **torch_pin sync** — when `torch_pin.py` is staged, updates the PyTorch commit
+   pin in `.ci/docker/ci_commit_pins/pytorch.txt` and syncs grafted c10 files.
+2. **lintrunner** — runs `lintrunner -a --revision HEAD^ --skip MYPY` on changed
+   files. Auto-fixes formatting and blocks on lint errors. Soft-fails if lintrunner
+   is not installed. Runs `lintrunner init` automatically when `.lintrunner.toml`
+   changes.
 
-### Installation
+### pre-push
 
-To install the Git hooks, run:
+Delegates to `.git/hooks/pre-push` if one exists. This allows backend-specific
+pre-push hooks (e.g., ARM's license and commit message checks) to work alongside
+the repo-wide hooks.
+
+## Installation
+
+Hooks are installed automatically by `./install_executorch.sh`.
+
+To install manually:
 
 ```bash
-.githooks/install.sh
+git config core.hooksPath .githooks
 ```
 
-This will copy the pre-commit hook to `.git/hooks/` and make it executable.
+### ARM backend pre-push
 
-### Manual Usage
-
-You can also run the update script manually at any time:
+ARM contributors should additionally install the ARM-specific pre-push hook:
 
 ```bash
-python .github/scripts/update_pytorch_pin.py
+cp backends/arm/scripts/pre-push .git/hooks/
 ```
 
-### Uninstalling
+## Bypassing
 
-To remove the pre-commit hook:
+To skip hooks for a single commit or push:
 
 ```bash
-rm .git/hooks/pre-commit
+git commit --no-verify
+git push --no-verify
 ```
 
 ## Troubleshooting
 
-If the hook fails during a commit:
+If the torch_pin hook fails:
 
 1. Check that Python 3 is available in your PATH
 2. Ensure you have internet connectivity to fetch commits from GitHub
 3. Verify that the `NIGHTLY_VERSION` in `torch_pin.py` is in the correct format (`devYYYYMMDD`)
-4. Make sure the corresponding nightly release exists in the PyTorch nightly branch
 
-You can run the script manually to see detailed error messages:
+If lintrunner fails:
 
-```bash
-python .github/scripts/update_pytorch_pin.py
-```
+1. Run `lintrunner init` to install linter tools
+2. Check that your virtual environment is activated

.githooks/install.sh

@@ -27,4 +27,68 @@ if git diff --cached --name-only | grep -q "^torch_pin.py$"; then
     fi
 fi
 
-exit 0
+# --- lintrunner ---
+
+if ! command -v lintrunner >/dev/null 2>&1; then
+    echo "Warning: lintrunner not found. Skipping lint checks."
+    echo "Install with: pip install lintrunner lintrunner-adapters && lintrunner init"
+    exit 0
+fi
+
+if [ ! -f .lintrunner.toml ]; then
+    echo "Warning: .lintrunner.toml not found. Skipping lint checks."
+    exit 0
+fi
+
+git_dir=$(git rev-parse --git-dir)
+
+# Portable hash: sha256sum (Linux) or shasum (macOS)
+if command -v sha256sum >/dev/null 2>&1; then
+    toml_hash=$(sha256sum .lintrunner.toml | cut -d' ' -f1)
+else
+    toml_hash=$(shasum -a 256 .lintrunner.toml | cut -d' ' -f1)
+fi
+stored_hash=""
+[ -f "${git_dir}/.lintrunner_init_hash" ] && stored_hash=$(cat "${git_dir}/.lintrunner_init_hash")
+
+if [ "${toml_hash}" != "${stored_hash}" ]; then
+    echo "Running lintrunner init..."
+    if lintrunner init; then
+        echo "${toml_hash}" > "${git_dir}/.lintrunner_init_hash"
+    else
+        echo "lintrunner init failed. Run 'lintrunner init' manually."
+        exit 1
+    fi
+fi
+
+staged_files=$(git diff --cached --name-only --diff-filter=ACMR)
+
+# Use HEAD^ if it exists (skip on initial commit)
+revision_flag="--revision HEAD^"
+if ! git rev-parse HEAD^ >/dev/null 2>&1; then
+    revision_flag=""
+fi
+
+lintrunner -a $revision_flag --skip MYPY
+lint_status=$?
+
+# Check if lintrunner modified any staged files. If so, block the commit
+# so the user can review the changes before committing.
+files_modified=0
+while IFS= read -r path; do
+    [ -z "${path}" ] && continue
+    if ! git diff --quiet -- "${path}" 2>/dev/null; then
+        files_modified=1
+        break
+    fi
+done <<< "${staged_files}"
+
+if [ $files_modified -eq 1 ]; then
+    echo "Lintrunner modified files. Review with 'git diff', then 'git add -u && git commit'."
+    exit 1
+fi
+
+if [ $lint_status -ne 0 ]; then
+    echo "Lint errors found. Fix them and try again, or use 'git commit --no-verify' to skip."
+    exit 1
+fi

.githooks/pre-commit

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Delegate to local pre-push hook if present (e.g., ARM backend).
+# .githooks/ is set as core.hooksPath, so git won't look in .git/hooks/
+# automatically. This passthrough ensures local hooks still run.
+local_hook="$(git rev-parse --git-dir)/hooks/pre-push"
+if [ -x "$local_hook" ]; then
+    "$local_hook" "$@"
+fi

.githooks/pre-push

@@ -0,0 +1,77 @@
+name: Test Cadence
+
+permissions:
+  id-token: write
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      docker-image:
+        description: 'Docker image to use'
+        required: false
+        type: string
+        default: ci-image:executorch-ubuntu-22.04-clang12
+      runner:
+        description: 'Runner type'
+        required: false
+        type: string
+        default: linux.8xlarge.memory
+      ref:
+        description: 'Git ref to checkout'
+        required: false
+        type: string
+        default: ${{ github.sha }}
+      timeout:
+        description: 'Job timeout in minutes'
+        required: false
+        type: number
+        default: 90
+
+jobs:
+  test-aot:
+    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
+    with:
+      job-name: test-aot
+      runner: ${{ inputs.runner }}
+      docker-image: ${{ inputs.docker-image }}
+      submodules: recursive
+      ref: ${{ inputs.ref }}
+      timeout: ${{ inputs.timeout }}
+      script: |
+        set -eux
+        conda create -y -n cadence_test python=3.12 > /dev/null
+        conda activate cadence_test
+
+        ./install_requirements.sh > /dev/null
+        pip install -e . --no-build-isolation > /dev/null
+        pip install beartype later pyre_extensions pytest-xdist
+
+        python -m pytest backends/cadence/aot/tests/ -v -n auto
+
+  test-ops:
+    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
+    with:
+      job-name: test-ops
+      runner: ${{ inputs.runner }}
+      docker-image: ${{ inputs.docker-image }}
+      submodules: recursive
+      ref: ${{ inputs.ref }}
+      timeout: ${{ inputs.timeout }}
+      download-artifact: cadence-runner-build
+      script: |
+        set -eux
+        conda create -y -n cadence_test python=3.12 > /dev/null
+        conda activate cadence_test
+
+        ./install_requirements.sh > /dev/null
+        pip install -e . --no-build-isolation > /dev/null
+        pip install beartype later pyre_extensions pytest-xdist
+
+        # Use the pre-built runner from the build job
+        mkdir -p cmake-out/backends/cadence
+        cp "${RUNNER_ARTIFACT_DIR}/cadence_runner" cmake-out/backends/cadence/cadence_runner
+        chmod +x cmake-out/backends/cadence/cadence_runner
+
+        export PYTHONPATH="${PYTHONPATH:-}:$(pwd)/backends/cadence/utils/FACTO"
+        python -m pytest examples/cadence/operators/ -v -n auto

.github/workflows/_test_cadence.yml

@@ -53,6 +53,9 @@ jobs:
         run: |
           VERSION="${{ inputs.version }}"
           FLAVOR="${{ inputs.flavor }}"
+          if [ -z "$FLAVOR" ]; then
+            FLAVOR="xnnpack"
+          fi
           if [ -z "$VERSION" ]; then
             echo "No version name specified. Will create a snapshot AAR"
             echo "should-skip=false" >> $GITHUB_OUTPUT
@@ -115,9 +118,10 @@ jobs:
         fi
 
         FLAVOR="${{ inputs.flavor }}"
-        if [ ! -z "$FLAVOR" ]; then
-          GRADLE_ARGS+=" -Dflavor=${FLAVOR}"
+        if [ -z "$FLAVOR" ]; then
+          FLAVOR="xnnpack"
         fi
+        GRADLE_ARGS+=" -Dflavor=${FLAVOR}"
 
         if [[ "$FLAVOR" == "vulkan" || "$FLAVOR" == "all" || -z "$FLAVOR" ]]; then
           curl -O https://sdk.lunarg.com/sdk/download/1.4.321.1/linux/vulkansdk-linux-x86_64-1.4.321.1.tar.xz

.github/workflows/android-release-artifacts.yml

@@ -1,19 +1,23 @@
-name: Build Cadence
+name: Cadence Build & Test
 
 on:
-  pull_request:
+  schedule:
+    - cron: 0 8 * * *
   push:
     branches:
       - main
       - release/*
+    tags:
+      - ciflow/nightly/*
+  pull_request:
   workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
   cancel-in-progress: true
 
 jobs:
-  cpu:
+  cpu-build:
     uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
     permissions:
       id-token: write
@@ -25,6 +29,7 @@ jobs:
       submodules: recursive
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 90
+      upload-artifact: cadence-runner-build
       script: |
         set -eux
         # The generic Linux job chooses to use base env, not the one setup by the image
@@ -33,3 +38,15 @@ jobs:
 
         ./install_requirements.sh > /dev/null
         bash backends/cadence/build_cadence_runner.sh
+
+        # Copy runner binary to artifact dir for downstream test jobs
+        cp cmake-out/backends/cadence/cadence_runner "${RUNNER_ARTIFACT_DIR}/"
+
+  cpu-test:
+    needs: cpu-build
+    permissions:
+      id-token: write
+      contents: read
+    uses: ./.github/workflows/_test_cadence.yml
+    with:
+      ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}