Skip to content

Commit 19622ec

Browse files
authored
Merge branch 'main' into jackzhxng-patch-3
2 parents d10197c + a1ed4ed commit 19622ec

File tree

163 files changed

+5264
-2767
lines changed

Some content is hidden

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

163 files changed

+5264
-2767
lines changed

.ci/scripts/test_backend_linux.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,17 @@ if [[ "$FLOW" == *qnn* ]]; then
3939
fi
4040

4141
if [[ "$FLOW" == *vulkan* ]]; then
42-
# Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate
42+
# Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate.
4343
source .ci/scripts/setup-vulkan-linux-deps.sh
4444

4545
EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_VULKAN=ON"
4646
fi
4747

48+
if [[ "$FLOW" == *arm* ]]; then
49+
# Setup ARM deps.
50+
.ci/scripts/setup-arm-baremetal-tools.sh
51+
fi
52+
4853
# We need the runner to test the built library.
4954
PYTHON_EXECUTABLE=python CMAKE_ARGS="$EXTRA_BUILD_ARGS" .ci/scripts/setup-linux.sh --build-tool cmake --build-mode Release --editable true
5055

.ci/scripts/test_llava.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ run_and_verify() {
149149

150150
# verify result.txt
151151
RESULT=$(cat result.txt)
152-
EXPECTED_PREFIX="ASSISTANT: image captures a basketball game in progress, with"
152+
EXPECTED_PREFIX="ASSISTANT: The image captures a basketball game in progress, with"
153153

154154
if [[ "${RESULT}" == *"${EXPECTED_PREFIX}"* ]]; then
155155
echo "Expected result prefix: ${EXPECTED_PREFIX}"

.github/workflows/_link_check.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,29 @@ jobs:
5555
echo "Or add \`@lint-ignore\` somewhere on the same line as the reference you want to skip checking."
5656
exit 1
5757
}
58+
59+
lint-file-size:
60+
if: ${{ github.event_name == 'pull_request' }}
61+
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
62+
with:
63+
runner: linux.2xlarge
64+
docker-image: ci-image:executorch-ubuntu-22.04-linter
65+
submodules: false
66+
fetch-depth: 0
67+
ref: ${{ inputs.ref }}
68+
timeout: 30
69+
script: |
70+
chmod +x ./scripts/lint_file_size.sh
71+
./scripts/lint_file_size.sh $(
72+
if [ "${{ github.event_name }}" = "pull_request" ]; then
73+
echo "${{ github.event.pull_request.base.sha }}" "${{ github.event.pull_request.head.sha }}"
74+
else
75+
echo "${{ github.event.before }}" "${{ github.sha }}"
76+
fi
77+
) || {
78+
echo
79+
echo "File size lint failed: some files exceed the 1 MB limit."
80+
echo "If you really need large files, consider using Git LFS or storing them elsewhere."
81+
echo "If you really need to get unblocked and check in the file, can add it to the EXCEPTIONS list in scripts/lint_file_size.sh."
82+
exit 1
83+
}

.github/workflows/_test_backend.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ on:
3131
required: false
3232
type: boolean
3333
default: false
34+
runner-linux:
35+
description: 'Runner type for Linux jobs'
36+
required: false
37+
type: string
38+
default: linux.4xlarge.memory
3439

3540
jobs:
3641
test-backend-linux:
@@ -44,7 +49,7 @@ jobs:
4449
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
4550
with:
4651
ref: ${{ inputs.ref }}
47-
runner: linux.4xlarge.memory
52+
runner: ${{ inputs.runner-linux }}
4853
docker-image: ci-image:executorch-ubuntu-22.04-clang12
4954
submodules: recursive
5055
timeout: ${{ inputs.timeout }}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Test ARM Backend
2+
3+
on:
4+
schedule:
5+
- cron: 0 2 * * *
6+
push:
7+
branches:
8+
- release/*
9+
tags:
10+
- ciflow/nightly/*
11+
pull_request:
12+
paths:
13+
- .github/workflows/test-backend-arm.yml
14+
- .github/workflows/_test_backend.yml
15+
workflow_dispatch:
16+
17+
concurrency:
18+
group: ${{ github.workflow }}--${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
test-arm:
23+
uses: ./.github/workflows/_test_backend.yml
24+
with:
25+
backend: arm
26+
flows: '["arm_tosa"]'
27+
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
28+
timeout: 120
29+
run-linux: true

.github/workflows/test-backend-coreml.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
schedule:
55
- cron: 0 2 * * *
66
push:
7+
branches:
8+
- release/*
79
tags:
810
- ciflow/nightly/*
911
pull_request:

.github/workflows/test-backend-qnn.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
schedule:
55
- cron: 0 2 * * *
66
push:
7+
branches:
8+
- release/*
79
tags:
810
- ciflow/nightly/*
911
pull_request:
@@ -25,3 +27,4 @@ jobs:
2527
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
2628
timeout: 120
2729
run-linux: true
30+
runner-linux: linux.8xlarge.memory

.github/workflows/test-backend-vulkan.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
schedule:
55
- cron: 0 2 * * *
66
push:
7+
branches:
8+
- release/*
79
tags:
810
- ciflow/nightly/*
911
pull_request:

.github/workflows/test-backend-xnnpack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
schedule:
55
- cron: 0 2 * * *
66
push:
7+
branches:
8+
- release/*
79
tags:
810
- ciflow/nightly/*
911
pull_request:

.github/workflows/trunk.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,8 +1016,8 @@ jobs:
10161016
strategy:
10171017
fail-fast: false
10181018
matrix:
1019-
model: [linear, add, add_mul, ic3, ic4, mv2, mv3, resnet18, resnet50, vit, w2l, mobilebert, emformer_join, emformer_transcribe]
1020-
backend: [portable, xnnpack-f32, xnnpack-q8]
1019+
model: [mv3, resnet50, vit, mobilebert, emformer_transcribe]
1020+
backend: [portable, xnnpack-q8]
10211021
with:
10221022
submodules: 'recursive'
10231023
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

0 commit comments

Comments
 (0)