microsoft · jchen351 · Mar 18, 2025 · Jan 8, 2025 · Jan 8, 2025 · Jan 8, 2025
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -110,7 +110,7 @@ jobs:
           --osx_arch=${{ matrix.target_arch }}
 
   Vcpkg:
-    runs-on: macos-13
+    runs-on: macOS-14
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5

diff --git a/cmake/CMakePresets.json b/cmake/CMakePresets.json
@@ -109,6 +109,29 @@
                 "rhs": "Darwin"
             }
         },
+        {
+            "name": "arm64-osx",
+            "inherits": [
+                "unit-test"
+            ],
+            "generator": "Xcode",
+            "binaryDir": "${sourceParentDir}/cmake_build/arm64-osx",
+            "installDir": "${sourceParentDir}/cmake_build/out",
+            "cacheVariables": {
+                "CMAKE_OSX_ARCHITECTURES": "arm64",
+                "onnxruntime_BUILD_SHARED_LIB": true,
+                "onnxruntime_USE_XNNPACK": false,
+                "onnxruntime_USE_COREML": true,
+                "onnxruntime_BUILD_OBJC": true,
+                "onnxruntime_BUILD_APPLE_FRAMEWORK": true,
+                "CMAKE_CONFIGURATION_TYPES": "Debug;Release"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Darwin"
+            }
+        },
         {
             "name": "x64-osx-vcpkg",
             "inherits": [

diff --git a/js/react_native/e2e/ios/Podfile b/js/react_native/e2e/ios/Podfile
@@ -15,7 +15,14 @@ end
 target 'OnnxruntimeModuleExample' do
   config = use_native_modules!
 
-  use_react_native!(:path => config["reactNativePath"])
+]# Check both symbol and string keys with default value
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # Hermes is now enabled by default. Disable by setting this flag to false.
+    # Upcoming versions of React Native may rely on get_default_flags(), but
+    # we make it explicit here to aid in the React Native upgrade process.
+    :hermes_enabled => false
+  )
 
   use_frameworks!
 
@@ -33,6 +40,9 @@ post_install do |installer|
         project.targets.each do |target|
             target.build_configurations.each do |config|
                 config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.1'
+
+                # TODO: remove this once we migrate the Pipelines to use arm64 MacOS
+                config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = "arm64"
             end
         end
     end

diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile
@@ -15,8 +15,14 @@ end
 def shared
   config = use_native_modules!
 
-  use_react_native!(:path => config["reactNativePath"])
-
+  # Check both symbol and string keys with default value
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # Hermes is now enabled by default. Disable by setting this flag to false.
+    # Upcoming versions of React Native may rely on get_default_flags(), but
+    # we make it explicit here to aid in the React Native upgrade process.
+    :hermes_enabled => false
+  )
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
 
@@ -44,7 +50,9 @@ post_install do |installer|
         project.targets.each do |target|
             target.build_configurations.each do |config|
                 config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.1'
+                # TODO: remove this once we migrate the Pipelines to use arm64 MacOS
+                config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = "arm64"
             end
         end
     end
-end
+end
diff --git a/onnxruntime/core/providers/coreml/model/model.mm b/onnxruntime/core/providers/coreml/model/model.mm
@@ -369,20 +369,22 @@ void ProfileComputePlan(NSURL* compileUrl, MLModelConfiguration* config) {
 #define HAS_COREMLOPTIMIZATIONHINT 0
 #endif
 
-API_AVAILABLE_COREML8
+
 void ConfigureOptimizationHints(MLModelConfiguration* config, const CoreMLOptions& coreml_options) {
+  if (HAS_COREML8_OR_LATER) {
 #if HAS_COREMLOPTIMIZATIONHINT
-  MLOptimizationHints* optimizationHints = [[MLOptimizationHints alloc] init];
-  if (coreml_options.UseStrategy("FastPrediction")) {
-    optimizationHints.specializationStrategy = MLSpecializationStrategyFastPrediction;
-    config.optimizationHints = optimizationHints;
-  } else if (coreml_options.UseStrategy("Default")) {
-    optimizationHints.specializationStrategy = MLSpecializationStrategyDefault;
-    config.optimizationHints = optimizationHints;
-  } else {
-    // not set
-  }
+    MLOptimizationHints* optimizationHints = [[MLOptimizationHints alloc] init];
+    if (coreml_options.UseStrategy("FastPrediction")) {
+      optimizationHints.specializationStrategy = MLSpecializationStrategyFastPrediction;
+      config.optimizationHints = optimizationHints;
+    } else if (coreml_options.UseStrategy("Default")) {
+      optimizationHints.specializationStrategy = MLSpecializationStrategyDefault;
+      config.optimizationHints = optimizationHints;
+    } else {
+      // not set
+    }
 #endif
+  }
 }
 
 Status CompileOrReadCachedModel(NSURL* modelUrl, const CoreMLOptions& coreml_options,

diff --git a/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml
@@ -33,7 +33,7 @@ jobs:
   workspace:
     clean: all
   pool:
-    vmImage: 'macOS-13'
+    vmImage: 'macOS-14'
   variables:
     MACOSX_DEPLOYMENT_TARGET: '13.3'
     TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]

diff --git a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml
@@ -31,15 +31,15 @@ pr:
 jobs:
 - job: iOS_CI_on_Mac
   pool:
-    vmImage: 'macOS-13'
+    vmImage: 'macOS-14'
   variables:
     PROTO_CACHE_DIR: $(Pipeline.Workspace)/proto_ccache
     ORT_CACHE_DIR: $(Pipeline.Workspace)/ort_ccache
     TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
     # Note: Keep the Xcode version and iOS simulator version compatible.
     # Check the table here to see what iOS simulator versions are supported by a particular Xcode version:
     # https://developer.apple.com/support/xcode/
-    XCODE_VERSION: 14.3.1
+    XCODE_VERSION: 15.3.0
     IOS_SIMULATOR_RUNTIME_VERSION: 16.4
   timeoutInMinutes: 150
   steps:

diff --git a/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml
@@ -54,7 +54,7 @@ stages:
     displayName: "Set common variables"
 
     pool:
-      vmImage: "macOS-13"
+      vmImage: "macOS-14"
 
     timeoutInMinutes: 5
 

diff --git a/tools/ci_build/github/azure-pipelines/nodejs/templates/test_macos.yml b/tools/ci_build/github/azure-pipelines/nodejs/templates/test_macos.yml
@@ -11,7 +11,7 @@ stages:
       clean: all
     timeoutInMinutes:  120
     pool:
-      vmImage: 'macOS-13'
+      vmImage: 'macOS-14'
 
     variables:
     - name: OnnxRuntimeBuildDirectory

diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml
@@ -11,7 +11,7 @@ stages:
     workspace:
       clean: all
     pool:
-      vmImage: 'macOS-13'
+      vmImage: 'macOS-14'
 
     variables:
     - name: OnnxRuntimeBuildDirectory

diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
@@ -423,7 +423,7 @@ stages:
   - job: IosDynamicFramework
     timeoutInMinutes: 120
     pool:
-      vmImage: "macOS-13"
+      vmImage: "macOS-14"
 
     steps:
     - task: UsePythonVersion@0
@@ -459,7 +459,7 @@ stages:
   - job: IosMinimalTrainingBuild
     timeoutInMinutes: 120
     pool:
-      vmImage: "macOS-13"
+      vmImage: "macOS-14"
 
     steps:
     - task: UsePythonVersion@0

diff --git a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml
@@ -29,7 +29,7 @@ stages:
       parameters:
         job_name: Test_MAC_Wheels
         machine_pool:
-          vmImage: 'macOS-13'
+          vmImage: 'macOS-14'
         itemPattern: '*/*mac*x86_64.whl'
     - template: templates/py-package-smoking-test.yml
       parameters:

diff --git a/tools/ci_build/github/azure-pipelines/stages/py-cpu-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/stages/py-cpu-packaging-stage.yml
@@ -240,7 +240,7 @@ stages:
       workspace:
         clean: all
       pool:
-        vmImage: 'macOS-13'
+        vmImage: 'macOS-14'
       variables:
         MACOSX_DEPLOYMENT_TARGET: '13.3'
       strategy:

diff --git a/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar-test.yml b/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar-test.yml
@@ -29,7 +29,7 @@ jobs:
   workspace:
     clean: all
   pool:
-    vmImage: 'macOS-13'
+    vmImage: 'macOS-14'
   variables:
   - name: runCodesignValidationInjection
     value: false

diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
@@ -119,7 +119,7 @@ stages:
     workspace:
       clean: all
     pool:
-      vmImage: 'macOS-13'
+      vmImage: 'macOS-14'
     timeoutInMinutes: 300
     steps:
     - template: set-version-number-variables-step.yml
@@ -816,7 +816,7 @@ stages:
 
 - template: ../nuget/templates/test_macos.yml
   parameters:
-    AgentPool : macOS-13
+    AgentPool : macOS-14
     ArtifactSuffix: 'CPU'
 
 - template: ../nodejs/templates/test_win.yml
@@ -852,4 +852,4 @@ stages:
     OS: MacOS
     BuildId: ${{ parameters.BuildId }}
     SpecificArtifact: ${{ parameters.SpecificArtifact }}
-    PoolName: 'macOS-13'
+    PoolName: 'macOS-14'
diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-pipeline.yml
@@ -68,7 +68,7 @@ stages:
   jobs:
     - job: MacOS_C_API_Package_Publish
       pool:
-          vmImage: 'macOS-13'
+          vmImage: 'macOS-14'
       steps:
       - checkout: none
       - template: flex-downloadPipelineArtifact.yml

diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packing-jobs.yml b/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packing-jobs.yml
@@ -37,7 +37,7 @@ jobs:
     PROTO_CACHE_DIR: $(Pipeline.Workspace)/ccache_proto
     ORT_CACHE_DIR: $(Pipeline.Workspace)/ccache_ort
   pool:
-    vmImage: 'macOS-13'
+    vmImage: 'macOS-14'
   timeoutInMinutes: 300
   steps:
   - checkout: self

diff --git a/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml b/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml
@@ -46,7 +46,7 @@ stages:
 
   - job: Build_Ios_Pod_For_React_Native
     pool:
-      vmImage: 'macOS-13'
+      vmImage: 'macOS-14'
 
     timeoutInMinutes: 90
 
@@ -103,7 +103,7 @@ stages:
   jobs:
   - job: ReactNative_CI
     pool:
-      vmImage: 'macOS-13'
+      vmImage: 'macOS-14'
     variables:
       runCodesignValidationInjection: false
     timeoutInMinutes: 90

diff --git a/tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml b/tools/ci_build/github/azure-pipelines/templates/stages/mac-ios-packaging-build-stage.yml
@@ -15,13 +15,13 @@ stages:
     displayName: "Build iOS package for variant: ${{ parameters.packageVariant}}"
 
     pool:
-      vmImage: "macOS-13"
+      vmImage: "macOS-14"
 
     variables:
       # Note: Keep the Xcode version and iOS simulator version compatible.
       # Check the table here to see what iOS simulator versions are supported by a particular Xcode version:
       # https://developer.apple.com/support/xcode/
-      xcodeVersion: "14.3.1"
+      xcodeVersion: "15.3.0"
       iosSimulatorRuntimeVersion: "16.4"
 
       ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']]

diff --git a/tools/ci_build/github/azure-pipelines/templates/use-xcode-version.yml b/tools/ci_build/github/azure-pipelines/templates/use-xcode-version.yml
@@ -3,7 +3,7 @@
 parameters:
 - name: xcodeVersion
   type: string
-  default: "14.3.1"
+  default: "15.3.0"
 
 steps:
 - bash: |