[WIP] Put back MPS build and use macos-m1-13

.github/workflows/build-cmake.yml

@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - runner: macos-m1-stable
+          - runner: macos-m1-13
       fail-fast: false
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:

.github/workflows/build-conda-m1.yml

@@ -46,7 +46,7 @@ jobs:
       post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}
       smoke-test-script: ${{ matrix.smoke-test-script }}
-      runner-type: macos-m1-stable
+      runner-type: macos-m1-13
       trigger-event: ${{ github.event_name }}
     secrets:
       CONDA_PYTORCHBOT_TOKEN: ${{ secrets.CONDA_PYTORCHBOT_TOKEN }}

.github/workflows/build-wheels-m1.yml

@@ -47,6 +47,6 @@ jobs:
       pre-script: ${{ matrix.pre-script }}
       post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}
-      runner-type: macos-m1-stable
+      runner-type: macos-m1-13
       smoke-test-script: ${{ matrix.smoke-test-script }}
       trigger-event: ${{ github.event_name }}

.github/workflows/tests.yml

@@ -53,7 +53,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-        runner: ["macos-m1-stable"]
+        runner: ["macos-m1-13"]
       fail-fast: false
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:

setup.py

@@ -5,7 +5,6 @@
 import shutil
 import subprocess
 import sys
-import warnings
 
 import torch
 from pkg_resources import DistributionNotFound, get_distribution, parse_version
@@ -205,14 +204,9 @@ def get_extensions():
             nvcc_flags = []
         extra_compile_args["nvcc"] = nvcc_flags
 
-    # FIXME: MPS build breaks custom ops registration, so it was disabled.
-    # See https://github.com/pytorch/vision/issues/8456.
-    # TODO: Fix MPS build, remove warning below, and put back commented-out elif block.V
-    if force_mps:
-        warnings.warn("MPS build is temporarily disabled!!!!")
-    # elif torch.backends.mps.is_available() or force_mps:
-    #     source_mps = glob.glob(os.path.join(extensions_dir, "ops", "mps", "*.mm"))
-    #     sources += source_mps
+    elif torch.backends.mps.is_available() or force_mps:
+        source_mps = glob.glob(os.path.join(extensions_dir, "ops", "mps", "*.mm"))
+        sources += source_mps
 
     if sys.platform == "win32":
         define_macros += [("torchvision_EXPORTS", None)]

test/conftest.py

@@ -49,8 +49,7 @@ def pytest_collection_modifyitems(items):
             # There are special cases though, see below
             item.add_marker(pytest.mark.skip(reason=CUDA_NOT_AVAILABLE_MSG))
 
-        # TODO: uncoment when MPS works again - see FIXME in setup.py
-        if needs_mps:  # and not torch.backends.mps.is_available():
+        if needs_mps and not torch.backends.mps.is_available():
             item.add_marker(pytest.mark.skip(reason=MPS_NOT_AVAILABLE_MSG))
 
         if IN_FBCODE: