From 333926d9690a6d08b7c6f2a2a7ce7e1b02b4f370 Mon Sep 17 00:00:00 2001 From: Tom Allsop Date: Thu, 24 Jul 2025 15:00:46 +0100 Subject: [PATCH 1/3] Add OOTB tests for macos-m1-stable runner * Separated out from https://github.com/pytorch/executorch/pull/12392 * Make job names more specific Signed-off-by: Tom Allsop Change-Id: Icdfba4bda4ed7021d6eed5698f529fee60919cdb --- .github/workflows/trunk.yml | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index 34a955b88a9..e38788eeb50 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -400,8 +400,8 @@ jobs: exit 1 fi - test-arm-ootb-linux: - name: test-arm-ootb-linux + test-arm-backend-ootb-linux: + name: test-arm-backend-ootb-linux uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main permissions: id-token: write @@ -431,6 +431,34 @@ jobs: # Run OOTB tests backends/arm/test/test_arm_ootb.sh + test-arm-backend-ootb-macos: + name: test-arm-backend-ootb-macos + uses: pytorch/test-infra/.github/workflows/macos_job.yml@main + with: + runner: macos-m1-stable + python-version: '3.11' + submodules: 'recursive' + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + timeout: 90 + script: | + set -eux + bash .ci/scripts/setup-conda.sh + eval "$(conda shell.bash hook)" + + # Follow the steps required before running the notebooks + # Try to mirror these as closely as possible + ${CONDA_RUN} source .ci/scripts/utils.sh + ${CONDA_RUN} install_executorch "--use-pt-pinned-commit" + + ${CONDA_RUN} sh .ci/scripts/setup-arm-baremetal-tools.sh + ${CONDA_RUN} source examples/arm/ethos-u-scratch/setup_path.sh + + # Install requirements for converting notebooks + ${CONDA_RUN} pip install notebook + + # Run OOTB tests + ${CONDA_RUN} sh backends/arm/test/test_arm_ootb.sh + test-coreml-delegate: name: test-coreml-delegate uses: pytorch/test-infra/.github/workflows/macos_job.yml@main From ca30709078a4e746e646682ad14ca0fcbd594763 Mon Sep 17 00:00:00 2001 From: Tom Allsop Date: Thu, 18 Sep 2025 10:50:48 +0100 Subject: [PATCH 2/3] Small rewrite of OOTB workflow Change-Id: Ibf5a1f54f9727d4d8b25aac58c33e1d3df945850 --- .github/workflows/trunk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index fecea6c06e2..7129a62a294 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -448,7 +448,7 @@ jobs: # Follow the steps required before running the notebooks # Try to mirror these as closely as possible ${CONDA_RUN} source .ci/scripts/utils.sh - ${CONDA_RUN} install_executorch "--use-pt-pinned-commit" + ${CONDA_RUN} python install_executorch.py "--use-pt-pinned-commit" ${CONDA_RUN} sh .ci/scripts/setup-arm-baremetal-tools.sh ${CONDA_RUN} source examples/arm/ethos-u-scratch/setup_path.sh From 96a129107c1b6fe3ad67f7e08bf86559af334a3c Mon Sep 17 00:00:00 2001 From: Tom Allsop Date: Thu, 18 Sep 2025 15:30:01 +0100 Subject: [PATCH 3/3] Use appropraite setup scripts Change-Id: Ia0380fdd212c69728cdc52e720f3129f47a2d217 --- .github/workflows/trunk.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index 7129a62a294..58b63763cef 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -445,10 +445,8 @@ jobs: bash .ci/scripts/setup-conda.sh eval "$(conda shell.bash hook)" - # Follow the steps required before running the notebooks - # Try to mirror these as closely as possible - ${CONDA_RUN} source .ci/scripts/utils.sh - ${CONDA_RUN} python install_executorch.py "--use-pt-pinned-commit" + # Setup environment - this builds ExecuTorch and the runner + PYTHON_EXECUTABLE=python ${CONDA_RUN} bash .ci/scripts/setup-macos.sh --build-tool "cmake" ${CONDA_RUN} sh .ci/scripts/setup-arm-baremetal-tools.sh ${CONDA_RUN} source examples/arm/ethos-u-scratch/setup_path.sh