diff --git a/.ci/scripts/test_model.sh b/.ci/scripts/test_model.sh index cd543ff1424..268584f138f 100755 --- a/.ci/scripts/test_model.sh +++ b/.ci/scripts/test_model.sh @@ -224,19 +224,22 @@ test_model_with_coreml() { "${PYTHON_EXECUTABLE}" -m examples.apple.coreml.scripts.export --model_name="${MODEL_NAME}" --compute_precision "${DTYPE}" EXPORTED_MODEL=$(find "." -type f -name "${MODEL_NAME}*.pte" -print -quit) - # TODO: + if [ -n "$EXPORTED_MODEL" ]; then EXPORTED_MODEL_WITH_DTYPE="${EXPORTED_MODEL%.pte}_${DTYPE}.pte" mv "$EXPORTED_MODEL" "$EXPORTED_MODEL_WITH_DTYPE" EXPORTED_MODEL="$EXPORTED_MODEL_WITH_DTYPE" - echo "Renamed file path: $EXPORTED_MODEL" + echo "OK exported model: $EXPORTED_MODEL" else - echo "No .pte file found" + echo "[error] failed to export model: no .pte file found" exit 1 fi # Run the model if [ "${should_test}" = true ]; then + echo "Installing requirements needed to build coreml_executor_runner..." + backends/apple/coreml/scripts/install_requirements.sh + echo "Testing exported model with coreml_executor_runner..." local out_dir=$(mktemp -d) COREML_EXECUTOR_RUNNER_OUT_DIR="${out_dir}" examples/apple/coreml/scripts/build_executor_runner.sh diff --git a/.ci/scripts/wheel/test_macos.py b/.ci/scripts/wheel/test_macos.py index cd4bce6c136..e0a5342186b 100644 --- a/.ci/scripts/wheel/test_macos.py +++ b/.ci/scripts/wheel/test_macos.py @@ -15,11 +15,9 @@ model=Model.Mv3, backend=Backend.XnnpackQuantizationDelegation, ), - # Enable this once CoreML is suppported out-of-the-box - # https://github.com/pytorch/executorch/issues/9019 - # test_base.ModelTest( - # model=Model.Mv3, - # backend=Backend.CoreMlTest, - # ) + test_base.ModelTest( + model=Model.Mv3, + backend=Backend.CoreMlTest, + ), ] ) diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml index 62d8728b8a5..4c08968f3d6 100644 --- a/.github/workflows/build-wheels-linux.yml +++ b/.github/workflows/build-wheels-linux.yml @@ -6,6 +6,9 @@ on: paths: - .ci/**/* - .github/workflows/build-wheels-linux.yml + - examples/**/* + - pyproject.toml + - setup.py push: branches: - nightly diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml index 490f01a46ca..3a394cff64b 100644 --- a/.github/workflows/build-wheels-macos.yml +++ b/.github/workflows/build-wheels-macos.yml @@ -6,6 +6,9 @@ on: paths: - .ci/**/* - .github/workflows/build-wheels-macos.yml + - examples/**/* + - pyproject.toml + - setup.py push: branches: - nightly @@ -57,6 +60,8 @@ jobs: pre-script: ${{ matrix.pre-script }} post-script: ${{ matrix.post-script }} package-name: ${{ matrix.package-name }} - runner-type: macos-m1-stable + # Meta's macOS runners do not have Xcode, so use GitHub's runners. + runner-type: macos-latest-xlarge + setup-miniconda: true smoke-test-script: ${{ matrix.smoke-test-script }} trigger-event: ${{ github.event_name }}