Skip to content

Commit bc3191f

Browse files
authored
Merge branch 'main' into yanwen/quant-dev
2 parents dd792ef + 667c91b commit bc3191f

869 files changed

Lines changed: 32945 additions & 5845 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/docker/requirements-ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sympy>=1.13.3
66
timm==0.6.13
77
tomli==2.0.1
88
torchsr==1.0.4
9-
transformers==4.56.1
9+
transformers==5.3.0
1010
zstd==1.5.5.1
1111
pandas>=2.2.2; python_version >= '3.10'
1212
pytest==7.2.0
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Copyright (c) Qualcomm Innovation Center, Inc.
2+
# All rights reserved
3+
#
4+
# This source code is licensed under the BSD-style license found in the
5+
# LICENSE file in the root directory of this source tree.
6+
7+
$ErrorActionPreference = "Stop"
8+
9+
conda create --yes --quiet -n et python=3.12
10+
conda activate et
11+
12+
# Install CI requirements
13+
pip install -r .ci/docker/requirements-ci.txt
14+
15+
# Provision the QNN SDK
16+
if ($env:QNN_SDK_ROOT -and (Test-Path -Path $env:QNN_SDK_ROOT)) {
17+
Write-Host "Using existing QNN SDK at $env:QNN_SDK_ROOT"
18+
} else {
19+
# Resolve the QNN_VERSION and QNN_ZIP_URL
20+
$qnnInfo = python -c "import sys; sys.path.insert(0, r'backends\qualcomm\scripts'); import download_qnn_sdk as d; print(d.QNN_VERSION); print(d.QNN_ZIP_URL)"
21+
if ($LASTEXITCODE -ne 0 -or $qnnInfo.Count -lt 2) {
22+
Write-Error "Failed to read QNN_VERSION and QNN_ZIP_URL from download_qnn_sdk.py."
23+
exit 1
24+
}
25+
$qnnVersion = $qnnInfo[0].Trim()
26+
$qnnZipUrl = $qnnInfo[1].Trim()
27+
28+
$qnnInstallDir = Join-Path $env:TEMP "qnn"
29+
New-Item -Path $qnnInstallDir -ItemType Directory -Force | Out-Null
30+
$qnnZip = Join-Path $env:TEMP "qnn_sdk.zip"
31+
Write-Host "Downloading QNN SDK v$qnnVersion ..."
32+
$ProgressPreference = "SilentlyContinue"
33+
Invoke-WebRequest -Uri $qnnZipUrl -OutFile $qnnZip
34+
Write-Host "Extracting QNN SDK ..."
35+
Expand-Archive -Path $qnnZip -DestinationPath $qnnInstallDir -Force
36+
Remove-Item -Path $qnnZip -Force
37+
38+
$env:QNN_SDK_ROOT = Join-Path $qnnInstallDir "qairt\$qnnVersion"
39+
Write-Host "Set QNN_SDK_ROOT=$env:QNN_SDK_ROOT"
40+
}
41+
42+
if (-not (Test-Path -Path (Join-Path $env:QNN_SDK_ROOT "include\QNN"))) {
43+
Write-Error "QNN SDK layout unexpected: missing include\QNN under $env:QNN_SDK_ROOT"
44+
exit 1
45+
}
46+
47+
# Test x86_64 Windows host build
48+
.\backends\qualcomm\scripts\build.ps1 -SkipArm64Windows -Release
49+
50+
$x86Artifacts = @(
51+
"build-x86_64-windows\backends\qualcomm\Release\PyQnnManagerAdaptor*.pyd",
52+
"build-x86_64-windows\backends\qualcomm\Release\qnn_executorch_backend.dll",
53+
"build-x86_64-windows\examples\qualcomm\executor_runner\Release\qnn_executor_runner.exe"
54+
)
55+
foreach ($artifact in $x86Artifacts) {
56+
if (-not (Get-ChildItem -Path $artifact -ErrorAction SilentlyContinue)) {
57+
Write-Error "ERROR: x86_64 artifact not found: $artifact"
58+
exit 1
59+
}
60+
}
61+
62+
# The ARM64 MSVC toolchain is currently not installed in the Windows CI
63+
# environment. Enabling this build configuration results in build failures
64+
# due to the missing ARM64 platform definition.
65+
# `.\backends\qualcomm\scripts\build.ps1 -SkipX86Windows -Release`
66+
#
67+
# Temporarily disable this build option until ARM64 MSVC support is available
68+
# in CI. The configuration can be re-enabled in a future update.
69+
70+
Write-Host "PASSED: QNN backend Windows MSVC build completed"

.ci/scripts/test_qnn_static_llama_eval.sh

Lines changed: 0 additions & 90 deletions
This file was deleted.

.ci/scripts/unittest-linux-cmake.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@ set -eux
1111
# Install from a local tosa-tools checkout when available. If absent in this
1212
# checkout layout, clone the pinned upstream tag and install from there.
1313
if ! python -c "import tosa_serializer" >/dev/null 2>&1; then
14-
TOSA_SERIALIZATION_DIR="./examples/arm/arm-scratch/tosa-tools/serialization"
15-
if [[ ! -d "${TOSA_SERIALIZATION_DIR}" ]]; then
14+
TOSA_TOOLS_DIR="./examples/arm/arm-scratch/tosa-tools"
15+
if [[ ! -d "${TOSA_TOOLS_DIR}" ]]; then
1616
TOSA_TOOLS_DIR="$(mktemp -d /tmp/tosa-tools.XXXXXX)"
17-
git clone --depth 1 --branch v2025.11.2 \
17+
git clone --depth 1 --branch v2026.05.0 \
1818
https://git.gitlab.arm.com/tosa/tosa-tools.git "${TOSA_TOOLS_DIR}"
19-
TOSA_SERIALIZATION_DIR="${TOSA_TOOLS_DIR}/serialization"
2019
fi
2120

2221
# NOTE: Will be removed when tosa-tools is installed via pypi
2322
python -m pip install pybind11==2.10.4
2423
CMAKE_POLICY_VERSION_MINIMUM=3.5 BUILD_PYBIND=1 \
2524
python -m pip install --no-dependencies \
26-
"${TOSA_SERIALIZATION_DIR}"
25+
"${TOSA_TOOLS_DIR}"
2726
python -c "import tosa_serializer"
2827
fi
2928

.claude/skills/building/SKILL.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ conda activate executorch
2323

2424
**Path B — no conda (fall back to venv):**
2525
```bash
26-
# Find a compatible Python (3.10–3.13). On macOS with only Homebrew Python 3.14+,
27-
# install a compatible version first: brew install python@3.12
28-
python3.12 -m venv .executorch-venv # or python3.11, python3.10, python3.13
26+
# Find a compatible Python (3.10–3.14).
27+
python3.12 -m venv .executorch-venv # or python3.11, python3.10, python3.13, python3.14
2928
source .executorch-venv/bin/activate
3029
pip install --upgrade pip
3130
```
3231

3332
**Then verify (either path):**
3433

3534
Run `python --version` and `cmake --version`. Fix automatically:
36-
- **Python not 3.10–3.13**: recreate the env with a correct Python version.
35+
- **Python not 3.10–3.14**: recreate the env with a correct Python version.
3736
- **cmake missing or < 3.24**: run `pip install 'cmake>=3.24'` inside the env.
3837
- **cmake >= 4.0**: works in practice, no action needed.
3938

.github/workflows/add-unanswered-to-project.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
// List of authors to exclude
2828
const excludedAuthors = new Set([
2929
"nil-is-all", "tanvirislam-meta", "cbilgin", "kimishpatel", "psiddh", "digantdesai", "SS-JIA", "ahmtox", "mcr229",
30-
"shoumikhin", "manuelcandales", "metascroy", "cccclai", "rohansjoshi", "kirklandsign", "abhinaykukkadapu",
31-
"JacobSzwejbka", "Conarnar", "rascani", "lucylq", "larryliu0820", "BujSet", "Gasoonjia", "Juntian777", "guangy10",
30+
"shoumikhin", "manuelcandales", "metascroy", "cccclai", "rohansjoshi", "kirklandsign", "abhinaykukkadapu", "JacobSzwejbka",
31+
"Conarnar", "rascani", "kiymetakdemir", "JCNTH", "lucylq", "larryliu0820", "BujSet", "Gasoonjia", "Juntian777", "guangy10",
3232
"jackzhxng", "GregoryComer", "leafs1", "swolchok", "mergennachin", "tarun292", "byjlw", "jathu", "Jack-Khuu", "georgehong",
33-
"zhenyan-zhang-meta", "silverguo", "harishs88ss", "AlannaBurke", "dbort", "huydhn", "mcremon-meta", "trivedivivek",
34-
"angelayi", "helunwencser", "hsharma35", "zhxchen17", "iseeyuan", "svekars", "nathanaelsee", "dulinriley",
33+
"zhenyan-zhang-meta", "silverguo", "harishs88ss", "AlannaBurke", "Doggeral", "laithsakka", "Reubend", "dbort", "huydhn", "mcremon-meta",
34+
"trivedivivek", "angelayi", "helunwencser", "hsharma35", "zhxchen17", "iseeyuan", "svekars", "nathanaelsee", "dulinriley",
3535
"jerryzh168", "cmodi-meta", "bigfootjon", "sxu", "ydwu4", "Riandy", "tugsbayasgalan", "bsoyluoglu", "yangw-dev",
3636
"YIWENX14", "namanahuja", "yushangdi", "limintang", "pianpwk", "viveknayakatmeta", "andreanicastro", "JakeStevens",
3737
"gmagogsfm", "zonglinpeng", "eigen-k", "derekxu", "salilsdesai", "skrtskrtfb", "pssrawat", "r-barnes",
@@ -50,7 +50,7 @@ jobs:
5050
"mansnils", "martinlsm", "freddan80", "YufengShi-dudu", "tom-arm", "perheld", "Jerry-Ge", "gggekov", "fumchin", "wwwind",
5151
"benkli01", "Tessil", "maddun01", "Michiel-Olieslagers", "armwaheed", "agrima1304", "emmakujala", "annietllnd",
5252
"MatthiasHertel80", "AlexTawseArm", "jmahbs", "morgolock", "Christoffer-JL", "ArmRyan", "xingguo01", "tgonzalezorlandoarm",
53-
"chizkiyahu", "sarah-blades", "itsMarco-G", "usamahz", "Rob-Hughes-Arm",
53+
"chizkiyahu", "sarah-blades", "itsMarco-G", "usamahz", "Rob-Hughes-Arm", "swha815", "FabulousSuperDude",
5454
"haowhsu-quic", "shewu-quic", "winskuo-quic", "chunit-quic", "DannyYuyang-quic", "chuntl", "thchenqti", "jethroqti",
5555
"chenweng-quic", "qti-horodnic", "qti-mmadhava", "quic-boyuc", "zhaoxul-qti",
5656
"cymbalrush", "DenisVieriu97", "billmguo",
@@ -63,7 +63,7 @@ jobs:
6363
6464
// List of organization logins (lowercased) to exclude members of
6565
const excludedOrgs = new Set([
66-
"meta", "facebook", "pytorch", "arm", "apple", "qualcomm", "nxp", "mediatek", "cadence", "intel", "samsung",
66+
"meta", "facebook", "pytorch", "arm", "apple", "qualcomm", "nxp", "mediatek", "cadence", "intel", "samsung", "arm ltd.",
6767
"@meta", "@facebook", "@pytorch", "@arm", "@apple", "@qualcomm", "@nxp", "@mediatek", "@cadence", "@intel", "@samsung"
6868
]);
6969

.github/workflows/build-wheels-aarch64-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
test-infra-ref: main
3131
with-cuda: disabled
3232
with-rocm: disabled
33-
python-versions: '["3.10", "3.11", "3.12", "3.13"]'
33+
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
3434

3535
build:
3636
needs: generate-matrix

.github/workflows/build-wheels-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
test-infra-ref: main
3131
with-cuda: disabled
3232
with-rocm: disabled
33-
python-versions: '["3.10", "3.11", "3.12", "3.13"]'
33+
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
3434

3535
build:
3636
needs: generate-matrix

.github/workflows/build-wheels-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
test-infra-ref: main
3131
with-cuda: disabled
3232
with-rocm: disabled
33-
python-versions: '["3.10", "3.11", "3.12", "3.13"]'
33+
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
3434

3535
build:
3636
needs: generate-matrix

.github/workflows/build-wheels-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
test-infra-ref: main
3434
with-cuda: disabled
3535
with-rocm: disabled
36-
python-versions: '["3.10", "3.11", "3.12", "3.13"]'
36+
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
3737

3838
build:
3939
needs: generate-matrix

0 commit comments

Comments
 (0)