Skip to content

Commit 97e4d83

Browse files
huydhnRyo-not-rio
authored andcommitted
Fix ExecuTorch CI after landing pytorch#6564 (pytorch#139700)
After landing pytorch/executorch#6564, we need to update the pinned ExecuTorch commit on PyTorch is fix the regression on PyTorch side. The change to `.ci/docker/common/install_executorch.sh` is needed because it's how the dependencies are setup on ExecuTorch CI now. Pull Request resolved: pytorch#139700 Approved by: https://github.com/larryliu0820, https://github.com/malfet
1 parent 070688f commit 97e4d83

File tree

4 files changed

+37
-31
lines changed

4 files changed

+37
-31
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
91c382df0d2b2ef383d57998a61187cfefcb26e3
1+
8ab3385f4187bad56c66dba29152e34c158f368a

.ci/docker/common/install_executorch.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@ install_conda_dependencies() {
3636
}
3737

3838
install_pip_dependencies() {
39-
pushd executorch/.ci/docker
40-
# Install PyTorch CPU build beforehand to avoid installing the much bigger CUDA
41-
# binaries later, ExecuTorch only needs CPU
42-
pip_install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
43-
# Install all Python dependencies
44-
pip_install -r requirements-ci.txt
39+
pushd executorch
40+
as_jenkins bash install_requirements.sh --pybind xnnpack
4541
popd
4642
}
4743

.github/workflows/pull.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -521,30 +521,6 @@ jobs:
521521
test-matrix: ${{ needs.linux-focal-cuda12_1-py3_10-gcc9-sm86-build.outputs.test-matrix }}
522522
secrets: inherit
523523

524-
linux-jammy-py3-clang12-executorch-build:
525-
name: linux-jammy-py3-clang12-executorch
526-
uses: ./.github/workflows/_linux-build.yml
527-
needs: get-label-type
528-
with:
529-
runner_prefix: "${{ needs.get-label-type.outputs.label-type }}"
530-
build-environment: linux-jammy-py3-clang12-executorch
531-
docker-image-name: pytorch-linux-jammy-py3-clang12-executorch
532-
test-matrix: |
533-
{ include: [
534-
{ config: "executorch", shard: 1, num_shards: 1, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
535-
]}
536-
secrets: inherit
537-
538-
linux-jammy-py3-clang12-executorch-test:
539-
name: linux-jammy-py3-clang12-executorch
540-
uses: ./.github/workflows/_linux-test.yml
541-
needs: linux-jammy-py3-clang12-executorch-build
542-
with:
543-
build-environment: linux-jammy-py3-clang12-executorch
544-
docker-image: ${{ needs.linux-jammy-py3-clang12-executorch-build.outputs.docker-image }}
545-
test-matrix: ${{ needs.linux-jammy-py3-clang12-executorch-build.outputs.test-matrix }}
546-
secrets: inherit
547-
548524
linux-focal-py3_12-clang10-experimental-split-build:
549525
if: false # See https://github.com/pytorch/pytorch/issues/138750
550526
name: linux-focal-py3.12-clang10-experimental-split-build

.github/workflows/unstable.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,37 @@ jobs:
3333
echo
3434
echo "Once the jobs are deemed stable enough (% red signal < 5% and TTS < 3h),"
3535
echo " they can graduate and move back to pull or trunk."
36+
37+
get-label-type:
38+
name: get-label-type
39+
uses: pytorch/pytorch/.github/workflows/_runner-determinator.yml@main
40+
if: ${{ (github.event_name != 'schedule' || github.repository == 'pytorch/pytorch') && github.repository_owner == 'pytorch' }}
41+
with:
42+
triggering_actor: ${{ github.triggering_actor }}
43+
issue_owner: ${{ github.event.pull_request.user.login || github.event.issue.user.login }}
44+
curr_branch: ${{ github.head_ref || github.ref_name }}
45+
46+
# TODO(huydhn): Mark executorch job as unstable until it's fixed
47+
linux-jammy-py3-clang12-executorch-build:
48+
name: linux-jammy-py3-clang12-executorch
49+
uses: ./.github/workflows/_linux-build.yml
50+
needs: get-label-type
51+
with:
52+
runner_prefix: "${{ needs.get-label-type.outputs.label-type }}"
53+
build-environment: linux-jammy-py3-clang12-executorch
54+
docker-image-name: pytorch-linux-jammy-py3-clang12-executorch
55+
test-matrix: |
56+
{ include: [
57+
{ config: "executorch", shard: 1, num_shards: 1, runner: "${{ needs.get-label-type.outputs.label-type }}linux.2xlarge" },
58+
]}
59+
secrets: inherit
60+
61+
linux-jammy-py3-clang12-executorch-test:
62+
name: linux-jammy-py3-clang12-executorch
63+
uses: ./.github/workflows/_linux-test.yml
64+
needs: linux-jammy-py3-clang12-executorch-build
65+
with:
66+
build-environment: linux-jammy-py3-clang12-executorch
67+
docker-image: ${{ needs.linux-jammy-py3-clang12-executorch-build.outputs.docker-image }}
68+
test-matrix: ${{ needs.linux-jammy-py3-clang12-executorch-build.outputs.test-matrix }}
69+
secrets: inherit

0 commit comments

Comments
 (0)