up

Author: metascroy

.github/workflows/_unittest.yml

@@ -43,7 +43,7 @@ jobs:
   macos:
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
-      runner: macos-m1-stable
+      runner: macos-15
       python-version: '3.11'
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

backends/apple/coreml/test/test_torch_ops.py

@@ -2,7 +2,10 @@
 #
 # Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
+<<<<<<< HEAD
 import platform
+=======
+>>>>>>> 921dafe9b (up)
 import sys
 import unittest