From acf9f65d3311a9ab63f4b486c42127eee1d410b5 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 30 Aug 2023 16:41:01 -0700 Subject: [PATCH 01/35] Update pool to MacOS-13 --- .../android-x86_64-crosscompile-ci-pipeline.yml | 12 +++--------- .../templates/android-java-api-aar-test.yml | 4 +--- .../azure-pipelines/templates/react-native-ci.yml | 4 +--- tools/python/util/android/android.py | 2 ++ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 7994be8655f52..e3f44dcc1515e 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -236,9 +236,7 @@ stages: jobs: - job: Test_CPU_EP pool: - # We need macOS-12 to run the Android emulator for now. - # https://github.com/actions/runner-images/issues/7671 - vmImage: 'macOS-12' + vmImage: 'macOS-13' workspace: clean: all condition: succeeded() @@ -307,9 +305,7 @@ stages: - job: Test_NNAPI_EP pool: - # We need macOS-12 to run the Android emulator for now. - # https://github.com/actions/runner-images/issues/7671 - vmImage: 'macOS-12' + vmImage: 'macOS-13' timeoutInMinutes: 90 workspace: clean: all @@ -402,9 +398,7 @@ stages: jobs: - job: NNAPI_EP_MASTER pool: - # We need macOS-12 to run the Android emulator for now. - # https://github.com/actions/runner-images/issues/7671 - vmImage: 'macOS-12' + vmImage: 'macOS-13' timeoutInMinutes: 180 workspace: clean: all 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 index 1263b21d4a03e..c5abd8ef3696d 100644 --- 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 @@ -20,9 +20,7 @@ jobs: workspace: clean: all pool: - # We need macOS-12 to run the Android emulator for now. - # https://github.com/actions/runner-images/issues/7671 - vmImage: 'macOS-12' + vmImage: 'macOS-13' variables: - name: runCodesignValidationInjection value: false 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 index 8c54e71448992..9f76a3f4d5b86 100644 --- a/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml @@ -50,9 +50,7 @@ stages: jobs: - job: ReactNative_CI pool: - # We need macOS-12 to run the Android emulator for now. - # https://github.com/actions/runner-images/issues/7671 - vmImage: 'macOS-12' + vmImage: 'macOS-13' variables: runCodesignValidationInjection: false TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] diff --git a/tools/python/util/android/android.py b/tools/python/util/android/android.py index 0baa21179d32d..f352feba6a82a 100644 --- a/tools/python/util/android/android.py +++ b/tools/python/util/android/android.py @@ -111,6 +111,8 @@ def start_emulator( "-no-audio", "-no-boot-anim", "-no-window", + "-gpu", + "swiftshader_indirect", ] if extra_args is not None: emulator_args += extra_args From 912c9a5eb21a82e65af4bbf9404a3ad3e1686d1d Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 24 Jun 2024 09:54:45 -0700 Subject: [PATCH 02/35] update jave sdk from 11 to 17 --- ...ndroid-x86_64-crosscompile-ci-pipeline.yml | 20 +++++++++---------- .../templates/android-java-api-aar-test.yml | 4 ++-- .../templates/react-native-ci.yml | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 82e0ea249429e..e7077d0495bf5 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -68,9 +68,9 @@ stages: versionSpec: $(pythonVersion) - task: JavaToolInstaller@0 - displayName: Use jdk 11 + displayName: Use jdk 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' @@ -152,9 +152,9 @@ stages: versionSpec: $(pythonVersion) - task: JavaToolInstaller@0 - displayName: Use jdk 11 + displayName: Use jdk 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' @@ -247,9 +247,9 @@ stages: versionSpec: $(pythonVersion) - task: JavaToolInstaller@0 - displayName: Use jdk 11 + displayName: Use jdk 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' @@ -310,9 +310,9 @@ stages: versionSpec: $(pythonVersion) - task: JavaToolInstaller@0 - displayName: Use jdk 11 + displayName: Use jdk 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' @@ -376,9 +376,9 @@ stages: versionSpec: $(pythonVersion) - task: JavaToolInstaller@0 - displayName: Use jdk 11 + displayName: Use jdk 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' 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 index d0248c89eb660..7fa548240f865 100644 --- 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 @@ -37,9 +37,9 @@ jobs: targetPath: '$(Build.BinariesDirectory)/final-android-aar' - task: JavaToolInstaller@0 - displayName: Use jdk 11 + displayName: Use jdk 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' 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 index 6fd5a3d47b4c1..afa2775645389 100644 --- a/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml @@ -116,9 +116,9 @@ stages: architecture: "x64" - task: JavaToolInstaller@0 - displayName: Use jdk 11 + displayName: Use jdk 17 inputs: - versionSpec: '11' + versionSpec: '17' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' From f820cf5a66823d7460ec7d8e54d86e7429b1f8ad Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 24 Jun 2024 09:56:49 -0700 Subject: [PATCH 03/35] Use Xcode version 14.3 instead of --- tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml | 2 +- .../github/azure-pipelines/templates/mac-cpu-packing-jobs.yml | 2 +- .../github/azure-pipelines/templates/py-packaging-stage.yml | 2 +- .../templates/stages/mac-ios-packaging-build-stage.yml | 2 +- .../github/azure-pipelines/templates/use-xcode-version.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 index c41f9589d8469..fd475a4d9f505 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -90,7 +90,7 @@ stages: - template: use-xcode-version.yml parameters: - xcodeVersion: 14.2 + xcodeVersion: 14.3 - template: download-deps.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 index 01ec3b5a2f8ca..b9b41326a6cac 100644 --- 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 @@ -62,7 +62,7 @@ jobs: - template: use-xcode-version.yml parameters: - xcodeVersion: 14.2 + xcodeVersion: 14.3 - template: download-deps.yml diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index 588ffca30c262..d1484a1511b91 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -431,7 +431,7 @@ stages: - template: use-xcode-version.yml parameters: - xcodeVersion: 14.2 + xcodeVersion: 14.3 - template: download-deps.yml 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 index a1ae63e606526..562c3e924bdec 100644 --- 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 @@ -18,7 +18,7 @@ stages: vmImage: "macOS-latest" variables: - xcodeVersion: "14.2" + xcodeVersion: "14.3" ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']] ${{ if eq(parameters.packageVariant, 'Full') }}: 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 index ec4398fe31fc5..7d767b4f4fde6 100644 --- 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.2" + default: "14.3" steps: - bash: | From 3d3389e03f7ebc398c2efeccef8c5951e49f233c Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 24 Jun 2024 11:51:21 -0700 Subject: [PATCH 04/35] 14.3.1 --- .../github/azure-pipelines/mac-coreml-ci-pipeline.yml | 2 +- tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml | 2 +- tools/ci_build/github/azure-pipelines/post-merge-jobs.yml | 4 ++-- tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml | 2 +- .../github/azure-pipelines/templates/mac-cpu-packing-jobs.yml | 2 +- .../github/azure-pipelines/templates/py-packaging-stage.yml | 2 +- .../templates/stages/mac-ios-packaging-build-stage.yml | 2 +- .../github/azure-pipelines/templates/use-xcode-version.yml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) 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 index f0a35d809c700..d944d7c6b91a2 100644 --- a/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml @@ -44,7 +44,7 @@ jobs: - template: templates/use-xcode-version.yml parameters: - xcodeVersion: 14.2 + xcodeVersion: 14.3.1 - template: templates/mac-build-step-with-cache.yml parameters: 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 index 0a19312790a98..4b0996272b70b 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml @@ -39,7 +39,7 @@ jobs: steps: - template: templates/use-xcode-version.yml parameters: - xcodeVersion: 14.2 + xcodeVersion: 14.3.1 - template: templates/mac-build-step-with-cache.yml parameters: WithCache: true diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index d6a3fa3147a47..f5a5672c0cf09 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -436,7 +436,7 @@ stages: - template: templates/use-xcode-version.yml parameters: - xcodeVersion: 14.2 + xcodeVersion: 14.3.1 - script: | pip install -r tools/ci_build/github/apple/ios_packaging.requirements.txt @@ -473,7 +473,7 @@ stages: - template: templates/use-xcode-version.yml parameters: - xcodeVersion: 14.2 + xcodeVersion: 14.3.1 - script: | pip install -r tools/ci_build/github/apple/ios_packaging.requirements.txt 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 index fd475a4d9f505..68df694358677 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -90,7 +90,7 @@ stages: - template: use-xcode-version.yml parameters: - xcodeVersion: 14.3 + xcodeVersion: 14.3.1 - template: download-deps.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 index b9b41326a6cac..a7a3f132d308b 100644 --- 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 @@ -62,7 +62,7 @@ jobs: - template: use-xcode-version.yml parameters: - xcodeVersion: 14.3 + xcodeVersion: 14.3.1 - template: download-deps.yml diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index d1484a1511b91..2b99750dbd251 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -431,7 +431,7 @@ stages: - template: use-xcode-version.yml parameters: - xcodeVersion: 14.3 + xcodeVersion: 14.3.1 - template: download-deps.yml 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 index 562c3e924bdec..ca8b7f1dc11a4 100644 --- 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 @@ -18,7 +18,7 @@ stages: vmImage: "macOS-latest" variables: - xcodeVersion: "14.3" + xcodeVersion: "14.3.1" ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']] ${{ if eq(parameters.packageVariant, 'Full') }}: 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 index 7d767b4f4fde6..2cf698aefa8bd 100644 --- 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" + default: "14.3.1" steps: - bash: | From 93ec7e2f93941633da542356bb9a46fab405b3af Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 24 Jun 2024 13:58:07 -0700 Subject: [PATCH 05/35] macOS-13 --- .../github/azure-pipelines/mac-coreml-ci-pipeline.yml | 2 +- .../ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml | 2 +- .../github/azure-pipelines/mac-ios-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/nodejs/templates/test_macos.yml | 2 +- .../github/azure-pipelines/nuget/templates/test_macos.yml | 2 +- tools/ci_build/github/azure-pipelines/post-merge-jobs.yml | 4 ++-- .../github/azure-pipelines/py-package-test-pipeline.yml | 2 +- .../ci_build/github/azure-pipelines/templates/c-api-cpu.yml | 6 +++--- .../templates/mac-cpu-packaging-pipeline.yml | 2 +- .../azure-pipelines/templates/mac-cpu-packing-jobs.yml | 2 +- .../github/azure-pipelines/templates/py-packaging-stage.yml | 2 +- .../templates/stages/mac-ios-packaging-build-stage.yml | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) 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 index d944d7c6b91a2..8042fbb118120 100644 --- a/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml @@ -32,7 +32,7 @@ jobs: workspace: clean: all pool: - vmImage: 'macOS-latest' + vmImage: 'macOS-13' variables: MACOSX_DEPLOYMENT_TARGET: '11.0' 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 index 4b0996272b70b..6edcf4dff7e9d 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml @@ -30,7 +30,7 @@ pr: jobs: - job: iOS_CI_on_Mac pool: - vmImage: 'macOS-latest' + vmImage: 'macOS-13' variables: PROTO_CACHE_DIR: $(Pipeline.Workspace)/proto_ccache ORT_CACHE_DIR: $(Pipeline.Workspace)/ort_ccache 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 index c209e20adc131..7a21195b772b6 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml @@ -53,7 +53,7 @@ stages: displayName: "Set common variables" pool: - vmImage: "macOS-latest" + vmImage: "macOS-13" 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 index 53923e0b4432a..4518a168879a2 100644 --- 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-latest' + vmImage: 'macOS-13' 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 index c977e17aada9d..07d21333270a8 100644 --- 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-latest' + vmImage: 'macOS-13' 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 index f5a5672c0cf09..48ec8572b24ec 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -425,7 +425,7 @@ stages: - job: IosDynamicFramework timeoutInMinutes: 120 pool: - vmImage: "macOS-latest" + vmImage: "macOS-13" steps: - task: UsePythonVersion@0 @@ -462,7 +462,7 @@ stages: - job: IosMinimalTrainingBuild timeoutInMinutes: 120 pool: - vmImage: "macOS-latest" + vmImage: "macOS-13" 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 index 63e70fa8e6488..4072041aafd26 100644 --- 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-latest' + vmImage: 'macOS-13' itemPattern: '*/*mac*x86_64.whl' - template: templates/py-package-smoking-test.yml parameters: 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 index 68df694358677..8540adfee6f69 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -83,7 +83,7 @@ stages: workspace: clean: all pool: - vmImage: 'macOS-latest' + vmImage: 'macOS-13' timeoutInMinutes: 300 steps: - template: set-version-number-variables-step.yml @@ -780,7 +780,7 @@ stages: - template: ../nuget/templates/test_macos.yml parameters: - AgentPool : macOS-latest + AgentPool : macOS-13 ArtifactSuffix: 'CPU' - template: ../nodejs/templates/test_win.yml @@ -816,4 +816,4 @@ stages: OS: MacOS BuildId: ${{ parameters.BuildId }} SpecificArtifact: ${{ parameters.SpecificArtifact }} - PoolName: 'macOS-latest' + PoolName: 'macOS-13' 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 index 945fbb7c4a094..080079388a76c 100644 --- 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 @@ -71,7 +71,7 @@ stages: ${{ if eq(parameters.DoESRP, true)}}: vmImage: 'macOS-12' ${{ else }}: - vmImage: 'macOS-latest' + vmImage: 'macOS-13' 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 index a7a3f132d308b..5ceb7abf9fc15 100644 --- 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-latest' + vmImage: 'macOS-13' timeoutInMinutes: 300 steps: - checkout: self diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index 2b99750dbd251..52f00fc862a6d 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -404,7 +404,7 @@ stages: workspace: clean: all pool: - vmImage: 'macOS-latest' + vmImage: 'macOS-13' variables: MACOSX_DEPLOYMENT_TARGET: '11.0' strategy: 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 index ca8b7f1dc11a4..36e32b750fa1b 100644 --- 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,7 +15,7 @@ stages: displayName: "Build iOS package for variant: ${{ parameters.packageVariant}}" pool: - vmImage: "macOS-latest" + vmImage: "macOS-13" variables: xcodeVersion: "14.3.1" From ee9dfc462371fb0b26a993e74f489c1994ddc29c Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 24 Jun 2024 14:58:34 -0700 Subject: [PATCH 06/35] macOS-13 --- .../azure-pipelines/templates/mac-cpu-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/templates/react-native-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 080079388a76c..1b1080034948e 100644 --- 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 @@ -69,7 +69,7 @@ stages: - job: MacOS_C_API_Package_Publish pool: ${{ if eq(parameters.DoESRP, true)}}: - vmImage: 'macOS-12' + vmImage: 'macOS-13' ${{ else }}: vmImage: 'macOS-13' steps: 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 index afa2775645389..ca0fa7c004a76 100644 --- a/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml @@ -41,7 +41,7 @@ stages: - job: Build_Ios_Pod_For_React_Native pool: - vmImage: 'macOS-12' + vmImage: 'macOS-13' timeoutInMinutes: 90 From f0ca208a7bddf991348600ee3467de9f8c35ca66 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 28 Jun 2024 13:08:54 -0700 Subject: [PATCH 07/35] update ios target to 15 --- .../project.pbxproj | 86 +++---------------- js/react_native/ios/Podfile | 2 +- 2 files changed, 15 insertions(+), 73 deletions(-) diff --git a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj index 2a093b2b89c95..5afefc7c7fdd1 100644 --- a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj +++ b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 55; objects = { /* Begin PBXBuildFile section */ @@ -203,7 +203,7 @@ }; }; buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "OnnxruntimeModule" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 13.0"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -233,72 +233,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 015C75E59BC80D4507FB6E8A /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OnnxruntimeModuleTest/Pods-OnnxruntimeModuleTest-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework", - "${BUILT_PRODUCTS_DIR}/RCT-Folly/folly.framework", - "${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework", - "${BUILT_PRODUCTS_DIR}/React-Codegen/React_Codegen.framework", - "${BUILT_PRODUCTS_DIR}/React-Core/React.framework", - "${BUILT_PRODUCTS_DIR}/React-CoreModules/CoreModules.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTAnimation/RCTAnimation.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTBlob/RCTBlob.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTImage/RCTImage.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTLinking/RCTLinking.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTNetwork/RCTNetwork.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTSettings/RCTSettings.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTText/RCTText.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTVibration/RCTVibration.framework", - "${BUILT_PRODUCTS_DIR}/React-bridging/react_bridging.framework", - "${BUILT_PRODUCTS_DIR}/React-cxxreact/cxxreact.framework", - "${BUILT_PRODUCTS_DIR}/React-jsi/jsi.framework", - "${BUILT_PRODUCTS_DIR}/React-jsiexecutor/jsireact.framework", - "${BUILT_PRODUCTS_DIR}/React-jsinspector/jsinspector.framework", - "${BUILT_PRODUCTS_DIR}/React-logger/logger.framework", - "${BUILT_PRODUCTS_DIR}/React-perflogger/reactperflogger.framework", - "${BUILT_PRODUCTS_DIR}/ReactCommon/ReactCommon.framework", - "${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework", - "${BUILT_PRODUCTS_DIR}/fmt/fmt.framework", - "${BUILT_PRODUCTS_DIR}/glog/glog.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React_Codegen.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CoreModules.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTAnimation.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTBlob.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTImage.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTLinking.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTNetwork.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTSettings.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTText.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTVibration.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_bridging.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cxxreact.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsi.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsireact.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsinspector.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/logger.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/reactperflogger.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactCommon.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fmt.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OnnxruntimeModuleTest/Pods-OnnxruntimeModuleTest-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 896E89AEC864CBD0CC7E0AF1 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -420,7 +354,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -465,7 +399,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -583,7 +517,11 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -657,7 +595,11 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index 53c83948672a3..0093d93c17d56 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -1,7 +1,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '13.0' +platform :ios, '15.0' def shared config = use_native_modules! From da23b7261ac7084d8180c8242e2308ecf1f213e8 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 17 Jul 2024 14:05:58 -0400 Subject: [PATCH 08/35] Installing gcovr from apt-get --- js/react_native/ios/Podfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index 0093d93c17d56..2f2ffa6f6f173 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -29,3 +29,11 @@ end target 'OnnxruntimeModuleTest' do shared end + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] + end + end +end \ No newline at end of file From ba098ad6847c9b17605751fa12002468b392e293 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 22 Aug 2024 11:03:12 -0700 Subject: [PATCH 09/35] Reverting podfile and project files --- .../project.pbxproj | 86 ++++++++++++++++--- js/react_native/ios/Podfile | 10 +-- 2 files changed, 73 insertions(+), 23 deletions(-) diff --git a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj index 5afefc7c7fdd1..2a093b2b89c95 100644 --- a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj +++ b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 55; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -203,7 +203,7 @@ }; }; buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "OnnxruntimeModule" */; - compatibilityVersion = "Xcode 13.0"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -233,6 +233,72 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 015C75E59BC80D4507FB6E8A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-OnnxruntimeModuleTest/Pods-OnnxruntimeModuleTest-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework", + "${BUILT_PRODUCTS_DIR}/RCT-Folly/folly.framework", + "${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework", + "${BUILT_PRODUCTS_DIR}/React-Codegen/React_Codegen.framework", + "${BUILT_PRODUCTS_DIR}/React-Core/React.framework", + "${BUILT_PRODUCTS_DIR}/React-CoreModules/CoreModules.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTAnimation/RCTAnimation.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTBlob/RCTBlob.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTImage/RCTImage.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTLinking/RCTLinking.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTNetwork/RCTNetwork.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTSettings/RCTSettings.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTText/RCTText.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTVibration/RCTVibration.framework", + "${BUILT_PRODUCTS_DIR}/React-bridging/react_bridging.framework", + "${BUILT_PRODUCTS_DIR}/React-cxxreact/cxxreact.framework", + "${BUILT_PRODUCTS_DIR}/React-jsi/jsi.framework", + "${BUILT_PRODUCTS_DIR}/React-jsiexecutor/jsireact.framework", + "${BUILT_PRODUCTS_DIR}/React-jsinspector/jsinspector.framework", + "${BUILT_PRODUCTS_DIR}/React-logger/logger.framework", + "${BUILT_PRODUCTS_DIR}/React-perflogger/reactperflogger.framework", + "${BUILT_PRODUCTS_DIR}/ReactCommon/ReactCommon.framework", + "${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework", + "${BUILT_PRODUCTS_DIR}/fmt/fmt.framework", + "${BUILT_PRODUCTS_DIR}/glog/glog.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React_Codegen.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CoreModules.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTAnimation.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTBlob.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTImage.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTLinking.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTNetwork.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTSettings.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTText.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTVibration.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_bridging.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cxxreact.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsi.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsireact.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsinspector.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/logger.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/reactperflogger.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactCommon.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fmt.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OnnxruntimeModuleTest/Pods-OnnxruntimeModuleTest-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 896E89AEC864CBD0CC7E0AF1 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -354,7 +420,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -399,7 +465,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -517,11 +583,7 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -595,11 +657,7 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index 2f2ffa6f6f173..53c83948672a3 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -1,7 +1,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '15.0' +platform :ios, '13.0' def shared config = use_native_modules! @@ -29,11 +29,3 @@ end target 'OnnxruntimeModuleTest' do shared end - -post_install do |installer| - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] - end - end -end \ No newline at end of file From 7fa3ac31b4a66c61c1401310b9bc607b70f4f54f Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 26 Aug 2024 13:33:18 -0700 Subject: [PATCH 10/35] Merging back with the master --- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index eebe1f5f2b4fa..5842fe38963ac 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -123,7 +123,6 @@ stages: timeoutInMinutes: ${{ variables.JobsTimeout }} workspace: clean: all - condition: notIn(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') steps: - task: UsePythonVersion@0 displayName: Use Python $(pythonVersion) @@ -150,6 +149,7 @@ stages: - script: | python3 tools/ci_build/build.py \ + --enable_lto \ --android \ --build_dir build_nnapi \ --android_sdk_path $ANDROID_HOME \ @@ -159,6 +159,7 @@ stages: --skip_submodule_sync \ --parallel \ --use_nnapi \ + --build_shared_lib \ --cmake_generator=Ninja \ --build_java displayName: NNAPI EP, Build, Test on Android Emulator @@ -208,6 +209,7 @@ stages: - script: | python3 tools/ci_build/build.py \ + --enable_lto \ --android \ --build_dir build_nnapi \ --android_sdk_path $ANDROID_HOME \ From 8b2c66e5d19707d32edf2edbd1c4ec43ef6a59ff Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 26 Aug 2024 16:19:36 -0700 Subject: [PATCH 11/35] Remove xcodeVersion when they are using the default version --- .../github/azure-pipelines/mac-coreml-ci-pipeline.yml | 2 -- tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml | 3 +-- tools/ci_build/github/azure-pipelines/post-merge-jobs.yml | 4 ---- tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml | 2 -- .../github/azure-pipelines/templates/mac-cpu-packing-jobs.yml | 2 -- .../github/azure-pipelines/templates/py-packaging-stage.yml | 2 -- .../templates/stages/mac-ios-packaging-build-stage.yml | 2 -- 7 files changed, 1 insertion(+), 16 deletions(-) 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 index 8042fbb118120..a3f56f5c448a9 100644 --- a/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml @@ -43,8 +43,6 @@ jobs: displayName: Install coreutils and ninja - template: templates/use-xcode-version.yml - parameters: - xcodeVersion: 14.3.1 - template: templates/mac-build-step-with-cache.yml parameters: 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 index 6edcf4dff7e9d..cf96c1d6fb510 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml @@ -38,8 +38,7 @@ jobs: timeoutInMinutes: 150 steps: - template: templates/use-xcode-version.yml - parameters: - xcodeVersion: 14.3.1 + - template: templates/mac-build-step-with-cache.yml parameters: WithCache: true diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index b6f611b709216..252d11dd1a9ef 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -435,8 +435,6 @@ stages: architecture: "x64" - template: templates/use-xcode-version.yml - parameters: - xcodeVersion: 14.3.1 - script: | pip install -r tools/ci_build/github/apple/ios_packaging.requirements.txt @@ -473,8 +471,6 @@ stages: architecture: "x64" - template: templates/use-xcode-version.yml - parameters: - xcodeVersion: 14.3.1 - script: | pip install -r tools/ci_build/github/apple/ios_packaging.requirements.txt 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 index e0b6ced0f5c31..5cd492481f420 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -89,8 +89,6 @@ stages: - template: set-version-number-variables-step.yml - template: use-xcode-version.yml - parameters: - xcodeVersion: 14.3.1 - template: download-deps.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 index 5ceb7abf9fc15..9a4225fd2d94b 100644 --- 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 @@ -61,8 +61,6 @@ jobs: - template: set-version-number-variables-step.yml - template: use-xcode-version.yml - parameters: - xcodeVersion: 14.3.1 - template: download-deps.yml diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index 7e4292aecdbf3..d5369c6bfcb63 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -419,8 +419,6 @@ stages: versionSpec: $(PythonVersion) - template: use-xcode-version.yml - parameters: - xcodeVersion: 14.3.1 - template: download-deps.yml 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 index 36e32b750fa1b..d2a321c367eeb 100644 --- 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 @@ -62,8 +62,6 @@ stages: architecture: "x64" - template: ../use-xcode-version.yml - parameters: - xcodeVersion: ${{ variables.xcodeVersion }} - template: ../install-appcenter.yml From 45aa698673206f1ed50c82727c8ae0b673e29b26 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 26 Aug 2024 18:25:06 -0700 Subject: [PATCH 12/35] use-xcode-version.yml --- .../github/azure-pipelines/templates/react-native-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index ca0fa7c004a76..b827f6d53c1dd 100644 --- a/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml @@ -52,7 +52,6 @@ stages: steps: - template: use-xcode-version.yml - - task: UsePythonVersion@0 displayName: Use python 3.9 inputs: @@ -107,7 +106,7 @@ stages: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: Clean Agent Directories condition: always() - + - template: use-xcode-version.yml - task: UsePythonVersion@0 displayName: Use python 3.9 inputs: From ae823f2663aa65ad48ff8213af06dfc2c3411a4b Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 27 Aug 2024 10:33:18 -0700 Subject: [PATCH 13/35] Trying Xcode 14.2 with the MacOS-13 --- .../templates/stages/mac-ios-packaging-build-stage.yml | 2 +- .../github/azure-pipelines/templates/use-xcode-version.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index d2a321c367eeb..01d8442008c64 100644 --- 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 @@ -18,7 +18,7 @@ stages: vmImage: "macOS-13" variables: - xcodeVersion: "14.3.1" + xcodeVersion: "14.2" ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']] ${{ if eq(parameters.packageVariant, 'Full') }}: 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 index 2cf698aefa8bd..ec4398fe31fc5 100644 --- 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: "14.2" steps: - bash: | From e264fae88a45edb50f38455f3ca4c3a93ac8431a Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 27 Aug 2024 13:17:37 -0700 Subject: [PATCH 14/35] Try to update to use ios simulator ios version 15 --- js/react_native/e2e/.detoxrc.js | 1 + js/react_native/e2e/ios/Podfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index e24833a1d09c9..b61427b393451 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -39,6 +39,7 @@ module.exports = { type: 'ios.simulator', device: { type: 'iPhone 13', + os: 'iOS 15.0' }, }, attached: { diff --git a/js/react_native/e2e/ios/Podfile b/js/react_native/e2e/ios/Podfile index d31a6f50221fb..cb7871beca37f 100644 --- a/js/react_native/e2e/ios/Podfile +++ b/js/react_native/e2e/ios/Podfile @@ -1,7 +1,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '13.0' +platform :ios, '15.0' target 'OnnxruntimeModuleExample' do config = use_native_modules! From 416d697eb43435d57362d3754623c9ec8f3fd694 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 27 Aug 2024 13:32:59 -0700 Subject: [PATCH 15/35] Update the xcode project.pbxproj --- js/react_native/e2e/.detoxrc.js | 1 - .../project.pbxproj | 39 +++++++++++++++---- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index b61427b393451..e24833a1d09c9 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -39,7 +39,6 @@ module.exports = { type: 'ios.simulator', device: { type: 'iPhone 13', - os: 'iOS 15.0' }, }, attached: { diff --git a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj index 2a093b2b89c95..f32f4df91cd10 100644 --- a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj +++ b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -189,7 +189,8 @@ 58B511D31A9E6C8500147676 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1540; ORGANIZATIONNAME = Facebook; TargetAttributes = { 58B511DA1A9E6C8500147676 = { @@ -204,11 +205,11 @@ }; buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "OnnxruntimeModule" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 58B511D21A9E6C8500147676; productRefGroup = 58B511D21A9E6C8500147676; @@ -380,6 +381,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -388,14 +391,17 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -404,6 +410,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -420,7 +427,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -432,6 +439,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -440,14 +449,17 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -456,6 +468,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -465,7 +478,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -484,6 +497,7 @@ "$(SRCROOT)/../../react-native/React/**", ); "HEADER_SEARCH_PATHS[arch=*]" = "\"$(PODS_ROOT)/onnxruntime/onnxruntime.framework/Headers\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -508,6 +522,7 @@ "$(SRCROOT)/../../react-native/React/**", ); "HEADER_SEARCH_PATHS[arch=*]" = "\"$(PODS_ROOT)/onnxruntime/onnxruntime.framework/Headers\""; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -583,7 +598,11 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -657,7 +676,11 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; From 11916d47ef8273719a870dadc069be3102980dfd Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 30 Aug 2024 10:49:58 -0700 Subject: [PATCH 16/35] Update targert iOS and MacOS in project setting --- .../project.pbxproj | 6 ++++-- .../OnnxruntimeModule.xcodeproj/project.pbxproj | 12 ++++++++---- .../apple_package_test.xcodeproj/project.pbxproj | 16 ++++++++-------- ...ault_full_apple_framework_build_settings.json | 2 +- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj b/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj index f2e4a791eae57..081462f739c8f 100644 --- a/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj +++ b/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj @@ -322,6 +322,7 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = OnnxruntimeModuleExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)", @@ -344,6 +345,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = OnnxruntimeModuleExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)", @@ -486,7 +488,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -514,7 +516,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleExampleUITests; diff --git a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj index f32f4df91cd10..4a908b92c21c1 100644 --- a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj +++ b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -478,7 +478,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -502,6 +502,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); + MACOSX_DEPLOYMENT_TARGET = 13.5; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = OnnxruntimeModule; SKIP_INSTALL = YES; @@ -527,6 +528,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); + MACOSX_DEPLOYMENT_TARGET = 13.5; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = OnnxruntimeModule; SKIP_INSTALL = YES; @@ -597,13 +599,14 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 13.5; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; @@ -675,13 +678,14 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 13.5; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj b/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj index eb7345be3770b..71b43ea06f399 100644 --- a/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj +++ b/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj @@ -527,7 +527,7 @@ CODE_SIGNING_STYLE = Automatic; CODE_SIGN_ENTITLEMENTS = ios_package_test/ios_package_test.entitlements; INFOPLIST_FILE = ios_package_test/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -550,7 +550,7 @@ CODE_SIGNING_STYLE = Automatic; CODE_SIGN_ENTITLEMENTS = ios_package_test/ios_package_test.entitlements; INFOPLIST_FILE = ios_package_test/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -571,7 +571,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -593,7 +593,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -631,7 +631,7 @@ "@executable_path/../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 13.5; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-test"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -663,7 +663,7 @@ "@executable_path/../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 13.5; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-test"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -684,7 +684,7 @@ GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 13.5; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-testUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -706,7 +706,7 @@ GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 13.5; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-testUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json b/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json index 84d7e355ed5b4..722e799d86707 100644 --- a/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json +++ b/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json @@ -24,7 +24,7 @@ ], "macosx": [ "--macos=MacOSX", - "--apple_deploy_target=11.0" + "--apple_deploy_target=13.0" ], "iphoneos": [ "--ios", From 6782c3ce619227ae5088bad5bd12bead19e30a38 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 30 Aug 2024 11:54:41 -0700 Subject: [PATCH 17/35] Update targert iOS and MacOS in project setting --- .../ios/OnnxruntimeModule.xcodeproj/project.pbxproj | 10 ++++++---- .../apple_package_test.xcodeproj/project.pbxproj | 12 ++++++------ .../default_full_apple_framework_build_settings.json | 2 +- .../stages/mac-ios-packaging-build-stage.yml | 2 +- .../azure-pipelines/templates/use-xcode-version.yml | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj index 4a908b92c21c1..124c46d073aaf 100644 --- a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj +++ b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj @@ -429,6 +429,7 @@ "HEADER_SEARCH_PATHS[arch=*]" = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -480,6 +481,7 @@ "HEADER_SEARCH_PATHS[arch=*]" = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -502,7 +504,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = OnnxruntimeModule; SKIP_INSTALL = YES; @@ -528,7 +530,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = OnnxruntimeModule; SKIP_INSTALL = YES; @@ -606,7 +608,7 @@ "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; @@ -685,7 +687,7 @@ "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj b/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj index 71b43ea06f399..e9536bb59bbae 100644 --- a/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj +++ b/onnxruntime/test/platform/apple/apple_package_test/apple_package_test.xcodeproj/project.pbxproj @@ -456,7 +456,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -510,7 +510,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -631,7 +631,7 @@ "@executable_path/../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-test"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -663,7 +663,7 @@ "@executable_path/../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-test"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -684,7 +684,7 @@ GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-testUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -706,7 +706,7 @@ GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 13.5; + MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "ai.onnxruntime.tests.macos-package-testUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json b/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json index 722e799d86707..f2d034dbfc000 100644 --- a/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json +++ b/tools/ci_build/github/apple/default_full_apple_framework_build_settings.json @@ -24,7 +24,7 @@ ], "macosx": [ "--macos=MacOSX", - "--apple_deploy_target=13.0" + "--apple_deploy_target=13.3" ], "iphoneos": [ "--ios", 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 index 01d8442008c64..d2a321c367eeb 100644 --- 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 @@ -18,7 +18,7 @@ stages: vmImage: "macOS-13" variables: - xcodeVersion: "14.2" + xcodeVersion: "14.3.1" ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']] ${{ if eq(parameters.packageVariant, 'Full') }}: 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 index ec4398fe31fc5..2cf698aefa8bd 100644 --- 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.2" + default: "14.3.1" steps: - bash: | From fe1dd8e58688bb9ba6f1fbc067f96f7193a489a2 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 30 Aug 2024 11:56:57 -0700 Subject: [PATCH 18/35] Update targert iOS and MacOS in project setting --- js/react_native/e2e/ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/react_native/e2e/ios/Podfile b/js/react_native/e2e/ios/Podfile index cb7871beca37f..d31a6f50221fb 100644 --- a/js/react_native/e2e/ios/Podfile +++ b/js/react_native/e2e/ios/Podfile @@ -1,7 +1,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '15.0' +platform :ios, '13.0' target 'OnnxruntimeModuleExample' do config = use_native_modules! From 21215b0064866737b73bf47b1c6a14c8099daf63 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 30 Aug 2024 11:58:22 -0700 Subject: [PATCH 19/35] Update targert iOS and MacOS in project setting --- .../ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml | 2 +- .../github/azure-pipelines/templates/mac-cpu-packing-jobs.yml | 2 +- .../github/azure-pipelines/templates/py-packaging-stage.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index a3f56f5c448a9..d4034e4d76979 100644 --- a/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml @@ -34,7 +34,7 @@ jobs: pool: vmImage: 'macOS-13' variables: - MACOSX_DEPLOYMENT_TARGET: '11.0' + MACOSX_DEPLOYMENT_TARGET: '13.3' TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] CCACHE_DIR: '$(Pipeline.Workspace)/ccache' timeoutInMinutes: 120 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 index 9a4225fd2d94b..3b661d9eb2dc6 100644 --- 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 @@ -31,7 +31,7 @@ jobs: workspace: clean: all variables: - MACOSX_DEPLOYMENT_TARGET: '11.0' + MACOSX_DEPLOYMENT_TARGET: '13.3' ALLOW_RELEASED_ONNX_OPSET_ONLY: ${{ parameters.AllowReleasedOpsetOnly }} TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)] PROTO_CACHE_DIR: $(Pipeline.Workspace)/ccache_proto diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index d5369c6bfcb63..9ae6d04e9b8de 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -395,7 +395,7 @@ stages: pool: vmImage: 'macOS-13' variables: - MACOSX_DEPLOYMENT_TARGET: '11.0' + MACOSX_DEPLOYMENT_TARGET: '13.3' strategy: matrix: Python38: From 324755dfeb105e9d9a898e1054213ee875d1d652 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 30 Aug 2024 14:38:57 -0700 Subject: [PATCH 20/35] Try setting RCTBlobManager manually --- js/react_native/ios/Podfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index 53c83948672a3..694d609f58015 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -7,7 +7,9 @@ def shared config = use_native_modules! use_react_native!(:path => config["reactNativePath"]) - + pod 'React', :path => '../node_modules/react-native', :subspecs => [ + 'RCTBlobManager' + ] # Comment the next line if you don't want to use dynamic frameworks use_frameworks! From 3b12d4a81b1a7afdf6a3048ace5554db758ef01f Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 30 Aug 2024 14:41:32 -0700 Subject: [PATCH 21/35] Reverting the changes --- js/react_native/ios/Podfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index 694d609f58015..53c83948672a3 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -7,9 +7,7 @@ def shared config = use_native_modules! use_react_native!(:path => config["reactNativePath"]) - pod 'React', :path => '../node_modules/react-native', :subspecs => [ - 'RCTBlobManager' - ] + # Comment the next line if you don't want to use dynamic frameworks use_frameworks! From 4e7291f7f34a6b764a31154df0108d04c1568aeb Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 30 Aug 2024 14:49:13 -0700 Subject: [PATCH 22/35] Set pod deployment target to 13.0 --- js/react_native/ios/Podfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index 53c83948672a3..ab076564f3c1e 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -29,3 +29,13 @@ end target 'OnnxruntimeModuleTest' do shared end + +post_install do |installer| + installer.generated_projects.each do |project| + project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end + end + end +end \ No newline at end of file From 572697c36cd27668fcca30bac9d935b574f3a7b8 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 3 Sep 2024 09:49:52 -0700 Subject: [PATCH 23/35] Retry xcode 14.2 again --- .../templates/stages/mac-ios-packaging-build-stage.yml | 2 +- .../github/azure-pipelines/templates/use-xcode-version.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index d2a321c367eeb..01d8442008c64 100644 --- 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 @@ -18,7 +18,7 @@ stages: vmImage: "macOS-13" variables: - xcodeVersion: "14.3.1" + xcodeVersion: "14.2" ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']] ${{ if eq(parameters.packageVariant, 'Full') }}: 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 index 2cf698aefa8bd..ec4398fe31fc5 100644 --- 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: "14.2" steps: - bash: | From 02faf93b2de6144a25a36bbb29790d24a4c4d05f Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 3 Sep 2024 12:46:18 -0700 Subject: [PATCH 24/35] Retry xcode 14.3 with need post installer config --- js/react_native/e2e/ios/Podfile | 9 +++++++++ .../templates/stages/mac-ios-packaging-build-stage.yml | 2 +- .../azure-pipelines/templates/use-xcode-version.yml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/js/react_native/e2e/ios/Podfile b/js/react_native/e2e/ios/Podfile index d31a6f50221fb..b8d8463ce719f 100644 --- a/js/react_native/e2e/ios/Podfile +++ b/js/react_native/e2e/ios/Podfile @@ -19,3 +19,12 @@ target 'OnnxruntimeModuleExample' do inherit! :search_paths end +post_install do |installer| + installer.generated_projects.each do |project| + project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end + end + end +end \ No newline at end of file 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 index 01d8442008c64..d2a321c367eeb 100644 --- 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 @@ -18,7 +18,7 @@ stages: vmImage: "macOS-13" variables: - xcodeVersion: "14.2" + xcodeVersion: "14.3.1" ortPodVersion: $[stageDependencies.IosPackaging_SetCommonVariables.j.outputs['SetCommonVariables.ORT_POD_VERSION']] ${{ if eq(parameters.packageVariant, 'Full') }}: 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 index ec4398fe31fc5..2cf698aefa8bd 100644 --- 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.2" + default: "14.3.1" steps: - bash: | From df9ae3e4852a3d15178b544a41c683c54c611ba4 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 4 Sep 2024 09:52:11 -0700 Subject: [PATCH 25/35] Apply fix for https://github.com/facebook/react-native/issues/32483 --- js/react_native/e2e/ios/Podfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/js/react_native/e2e/ios/Podfile b/js/react_native/e2e/ios/Podfile index b8d8463ce719f..2636ef3515e4d 100644 --- a/js/react_native/e2e/ios/Podfile +++ b/js/react_native/e2e/ios/Podfile @@ -3,6 +3,15 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ platform :ios, '13.0' +pre_install do |installer| + # Custom pre-install script or commands + puts "Running pre-install script..." + + # Recommended fix for https://github.com/facebook/react-native/issues/32483 + # from https://github.com/facebook/react-native/issues/32483#issuecomment-966784501 + system("sed -i '' 's/typedef uint8_t clockid_t;//' \"${SRCROOT}/Pods/RCT-Folly/folly/portability/Time.h\"") +end + target 'OnnxruntimeModuleExample' do config = use_native_modules! From dedeaad3e772894befe53bd61f902609e9d34ae8 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 4 Sep 2024 09:56:43 -0700 Subject: [PATCH 26/35] Apply fix for https://github.com/facebook/react-native/issues/32483 --- js/react_native/ios/Podfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index ab076564f3c1e..a693f9aaa05ee 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -3,6 +3,15 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ platform :ios, '13.0' +pre_install do |installer| + # Custom pre-install script or commands + puts "Running pre-install script..." + + # Recommended fix for https://github.com/facebook/react-native/issues/32483 + # from https://github.com/facebook/react-native/issues/32483#issuecomment-966784501 + system("sed -i '' 's/typedef uint8_t clockid_t;//' \"${SRCROOT}/Pods/RCT-Folly/folly/portability/Time.h\"") +end + def shared config = use_native_modules! From 1296dd352ab6c54aaaa40164278cb912e75bbf6b Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 4 Sep 2024 12:42:44 -0700 Subject: [PATCH 27/35] Update time.h --- .../ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj | 4 ++-- js/react_native/e2e/ios/Podfile | 2 +- js/react_native/ios/Podfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj b/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj index 081462f739c8f..d97410b999f42 100644 --- a/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj +++ b/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj @@ -407,7 +407,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; "HEADER_SEARCH_PATHS[arch=*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", @@ -460,7 +460,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", diff --git a/js/react_native/e2e/ios/Podfile b/js/react_native/e2e/ios/Podfile index 2636ef3515e4d..0272c23092838 100644 --- a/js/react_native/e2e/ios/Podfile +++ b/js/react_native/e2e/ios/Podfile @@ -9,7 +9,7 @@ pre_install do |installer| # Recommended fix for https://github.com/facebook/react-native/issues/32483 # from https://github.com/facebook/react-native/issues/32483#issuecomment-966784501 - system("sed -i '' 's/typedef uint8_t clockid_t;//' \"${SRCROOT}/Pods/RCT-Folly/folly/portability/Time.h\"") + system("sed -i '' 's/typedef uint8_t clockid_t;//' \"./Pods/RCT-Folly/folly/portability/Time.h\"") end target 'OnnxruntimeModuleExample' do diff --git a/js/react_native/ios/Podfile b/js/react_native/ios/Podfile index a693f9aaa05ee..ad8a5ce3b2d5f 100644 --- a/js/react_native/ios/Podfile +++ b/js/react_native/ios/Podfile @@ -9,7 +9,7 @@ pre_install do |installer| # Recommended fix for https://github.com/facebook/react-native/issues/32483 # from https://github.com/facebook/react-native/issues/32483#issuecomment-966784501 - system("sed -i '' 's/typedef uint8_t clockid_t;//' \"${SRCROOT}/Pods/RCT-Folly/folly/portability/Time.h\"") + system("sed -i '' 's/typedef uint8_t clockid_t;//' \"./Pods/RCT-Folly/folly/portability/Time.h\"") end def shared From 0f29f75817d3355ea4ddf21e61ff4b5404341e4e Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 4 Sep 2024 14:20:09 -0700 Subject: [PATCH 28/35] Update project.pbxproj --- .../project.pbxproj | 2 +- .../project.pbxproj | 34 +++---------------- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj b/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj index d97410b999f42..b7c38547d67e1 100644 --- a/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj +++ b/js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ diff --git a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj index 124c46d073aaf..f11bc73687098 100644 --- a/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj +++ b/js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj @@ -205,11 +205,11 @@ }; buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "OnnxruntimeModule" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; + developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, - Base, ); mainGroup = 58B511D21A9E6C8500147676; productRefGroup = 58B511D21A9E6C8500147676; @@ -381,8 +381,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -391,17 +389,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -410,7 +405,6 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -429,7 +423,6 @@ "HEADER_SEARCH_PATHS[arch=*]" = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -440,8 +433,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -450,17 +441,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -469,7 +457,6 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -481,7 +468,6 @@ "HEADER_SEARCH_PATHS[arch=*]" = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -504,7 +490,6 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MACOSX_DEPLOYMENT_TARGET = 13.3; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = OnnxruntimeModule; SKIP_INSTALL = YES; @@ -530,7 +515,6 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MACOSX_DEPLOYMENT_TARGET = 13.3; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = OnnxruntimeModule; SKIP_INSTALL = YES; @@ -602,13 +586,8 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; @@ -681,13 +660,8 @@ ); INFOPLIST_FILE = OnnxruntimeModuleTest/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 13.3; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.reactnative.OnnxruntimeModuleTest; PRODUCT_NAME = "$(TARGET_NAME)"; From 4ff2120e53b376b250e852e6922c9ed873ea14e3 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 11 Sep 2024 12:11:54 -0700 Subject: [PATCH 29/35] define iOS to 13.0 because default iOS version 17.2 --- js/react_native/e2e/.detoxrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index e24833a1d09c9..f166aca64af5c 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -39,6 +39,7 @@ module.exports = { type: 'ios.simulator', device: { type: 'iPhone 13', + os: 'iOS 13.0' }, }, attached: { From c70e7d7817b0daea0243251b5924cdd1023858c1 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 11 Sep 2024 12:29:38 -0700 Subject: [PATCH 30/35] define iOS to 13.0 because default iOS version 17.2 --- js/react_native/e2e/.detoxrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index f166aca64af5c..d0afaa1451a3e 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -39,7 +39,7 @@ module.exports = { type: 'ios.simulator', device: { type: 'iPhone 13', - os: 'iOS 13.0' + os: 'iOS 13.0', }, }, attached: { From c7d3de8cafffb7cca1be00669b027ad486527912 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 11 Sep 2024 14:09:18 -0700 Subject: [PATCH 31/35] Change the simulator device type to iphone 11, because ios 13 cannot support iphone 13 --- js/react_native/e2e/.detoxrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index d0afaa1451a3e..a975aa050112c 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -38,7 +38,7 @@ module.exports = { simulator: { type: 'ios.simulator', device: { - type: 'iPhone 13', + type: 'iPhone 11', os: 'iOS 13.0', }, }, From 183ccaa9b45b91178d2f9f28cfb8ed6f77dfae04 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 12 Sep 2024 10:24:37 -0700 Subject: [PATCH 32/35] Change the simulator device type to iphone 11, because the default iOS version is 17.2 which our current xcode version 14.3.1 cannot support --- js/react_native/e2e/.detoxrc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index a975aa050112c..e312bc4e9f172 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -39,7 +39,6 @@ module.exports = { type: 'ios.simulator', device: { type: 'iPhone 11', - os: 'iOS 13.0', }, }, attached: { From d11a6efa24b24263ccd528432d9dfe0766328f83 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 12 Sep 2024 10:34:30 -0700 Subject: [PATCH 33/35] Adding script to check the list of supported devices --- js/react_native/e2e/.detoxrc.js | 3 ++- .../github/azure-pipelines/templates/react-native-ci.yml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index e312bc4e9f172..d96ac84a5acae 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -38,7 +38,8 @@ module.exports = { simulator: { type: 'ios.simulator', device: { - type: 'iPhone 11', + type: 'iPhone 13', + os: 'iOS 16.4', }, }, attached: { 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 index b827f6d53c1dd..48ad4317dccbc 100644 --- a/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml @@ -313,6 +313,11 @@ stages: condition: succeededOrFailed() displayName: Publish React Native iOS Instrumented Test Results + - script: | + xcrun simctl list devices + displayName: List iOS Simulators + continueOnError: true + - script: | JEST_JUNIT_OUTPUT_FILE=$(Build.SourcesDirectory)/js/react_native/e2e/ios-test-results.xml \ detox test --record-logs all --configuration ios.sim.release --loglevel trace From 69c5eb616316f676301466b2f03c7154937b24f7 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 12 Sep 2024 12:55:11 -0700 Subject: [PATCH 34/35] iPhone 13 is no longer supported with current MacOS image so I am using iphone 14 --- js/react_native/e2e/.detoxrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/react_native/e2e/.detoxrc.js b/js/react_native/e2e/.detoxrc.js index d96ac84a5acae..0792c3d528585 100644 --- a/js/react_native/e2e/.detoxrc.js +++ b/js/react_native/e2e/.detoxrc.js @@ -38,7 +38,7 @@ module.exports = { simulator: { type: 'ios.simulator', device: { - type: 'iPhone 13', + type: 'iPhone 14', os: 'iOS 16.4', }, }, From 6e5f286b52521e19559fe863b7759eabca1cba05 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 13 Sep 2024 09:48:59 -0700 Subject: [PATCH 35/35] Using iPhone 14 with iOS 16.4 for xcode Instrumented Tests --- .../github/azure-pipelines/templates/react-native-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 48ad4317dccbc..5bad4f97e8aec 100644 --- a/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml @@ -298,7 +298,7 @@ stages: scheme: 'OnnxruntimeModuleTest' packageApp: false destinationPlatformOption: 'iOS' - destinationSimulators: 'iPhone 13,OS=latest' + destinationSimulators: 'iPhone 14,OS=16.4' workingDirectory: '$(Build.SourcesDirectory)/js/react_native/ios' xcprettyArgs: '--output build/reports/test-results.xml' publishJUnitResults: true