Skip to content

Commit 061c032

Browse files
authored
Merge branch 'main' into export-D103467782
2 parents 9efe5d3 + 8f1abad commit 061c032

42 files changed

Lines changed: 692 additions & 142 deletions

Some content is hidden

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

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

.github/workflows/pull.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,7 @@ jobs:
852852
strategy:
853853
matrix:
854854
dtype: [fp32]
855-
# TODO(T12345): re-enable qnn_16a16w once OOM on linux.2xlarge is resolved
856-
pt2e_quantize: [qnn_8a8w]
855+
pt2e_quantize: [qnn_16a16w, qnn_8a8w]
857856
mode: [qnn]
858857
fail-fast: false
859858
with:

.github/workflows/trunk.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -951,8 +951,7 @@ jobs:
951951
strategy:
952952
matrix:
953953
dtype: [fp32]
954-
# TODO(T12345): re-enable qnn_16a16w once OOM on linux.2xlarge is resolved
955-
pt2e_quantize: [qnn_8a8w]
954+
pt2e_quantize: [qnn_16a16w, qnn_8a8w]
956955
mode: [qnn]
957956
fail-fast: false
958957
with:

backends/arm/test/models/Qwen3_VL/test_qwen3_vl_model.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,17 @@ def _test_qwen3_vl_full_models_tosa_FP(
252252
def _test_qwen3_vl_full_models_tosa_FP_bf16(
253253
test_case: Qwen3VLModelTestCase,
254254
config_factory=_make_qwen3_vl_e2e_test_config,
255+
text_model_atol: float | None = None,
255256
):
256257
model, inputs = test_case.model_cls.prepare_model_and_inputs(config_factory)
257258
model, inputs = _to_bfloat16_model_and_floating_inputs(model, inputs)
258259
# Slightly higher atol for TOSA BF16 on aarch64 (MLETORCH-2048: numeric mismatch)
259-
atol = (
260-
0.4
261-
if common.is_aarch64_host()
262-
and test_case.model_cls is LowerableVisionModelWrapper
263-
else 0.1
264-
)
260+
if common.is_aarch64_host() and test_case.model_cls is LowerableVisionModelWrapper:
261+
atol = 0.4
262+
elif text_model_atol is not None and test_case.model_cls is TextModelWrapper:
263+
atol = text_model_atol
264+
else:
265+
atol = 0.1
265266
with torch.no_grad():
266267
pipeline = TosaPipelineFP[input_t](
267268
model,
@@ -382,7 +383,9 @@ def test_qwen3_vl_2b_instruct_full_models_tosa_FP_bf16(
382383
test_case: Qwen3VLModelTestCase,
383384
):
384385
_test_qwen3_vl_full_models_tosa_FP_bf16(
385-
test_case, _make_qwen3_vl_2b_instruct_layer_config
386+
test_case,
387+
_make_qwen3_vl_2b_instruct_layer_config,
388+
text_model_atol=0.15,
386389
)
387390

388391

0 commit comments

Comments
 (0)