saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-24 02:47:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to MacOS-12 (#14924)

Browse source 
### Description
<!-- Describe your changes. -->


Update to MacOS-12
### Motivation and Context

Fixed
[AB#13233](https://aiinfra.visualstudio.com/6a833879-cd9b-44a4-a9de-adc2d818f13c/_workitems/edit/13233)
This commit is contained in:
Jian Chen 2023-03-09 10:18:14 -08:00 committed by GitHub
parent 51b67fa15c
commit b4fe98ac2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
View file

@ -192,7 +192,7 @@ stages:
jobs:
- job: Test_CPU_EP
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
workspace:
clean: all
condition: succeeded()
@ -261,7 +261,7 @@ stages:
- job: Test_NNAPI_EP
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
timeoutInMinutes: 90
workspace:
clean: all
@ -354,7 +354,7 @@ stages:
jobs:
- job: NNAPI_EP_MASTER
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
timeoutInMinutes: 180
workspace:
clean: all

2
tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml
View file

@ -1,7 +1,7 @@
jobs:
- job: CoreML_CI
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
MACOSX_DEPLOYMENT_TARGET: '10.14'
timeoutInMinutes: 120

3
tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml
View file

@ -1,7 +1,7 @@
jobs:
- job: iOS_CI_on_Mac
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
MACOSX_DEPLOYMENT_TARGET: '10.14'
timeoutInMinutes: 150
@ -12,6 +12,7 @@ jobs:
displayName: Install protobuf
- script: |
sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py \
--skip_submodule_sync \
--build_dir $(Build.BinariesDirectory)/iOS \

2
tools/ci_build/github/azure-pipelines/mac-ios-packaging-pipeline.yml
View file

@ -19,7 +19,7 @@ jobs:
displayName: "iOS Packaging"
pool:
vmImage: "macOS-11"
vmImage: "macOS-12"
timeoutInMinutes: 300

2
tools/ci_build/github/azure-pipelines/nodejs/templates/test_macos.yml
View file

@ -7,7 +7,7 @@ jobs:
clean: all
timeoutInMinutes: 120
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
dependsOn:
- Nodejs_Packaging_CPU
condition: succeeded()

2
tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml
View file

@ -6,7 +6,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
dependsOn:
- NuGet_Packaging_${{ parameters.ArtifactSuffix }}
condition: succeeded()

2
tools/ci_build/github/azure-pipelines/templates/android-java-api-aar-test.yml
View file

@ -20,7 +20,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
- name: runCodesignValidationInjection
value: false

8
tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
View file

@ -85,7 +85,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
timeoutInMinutes: 300
steps:
- template: set-version-number-variables-step.yml
@ -764,7 +764,7 @@ jobs:
- template: ../nuget/templates/test_macos.yml
parameters:
AgentPool : macOS-11
AgentPool : macOS-12
ArtifactSuffix: 'CPU'
- template: ../nodejs/templates/test_win.yml
@ -865,7 +865,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
- name: runCodesignValidationInjection
value: false
@ -893,7 +893,7 @@ jobs:
popd
wget https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar -P ./
wget https://oss.sonatype.org/service/local/repositories/releases/content/com/google/protobuf/protobuf-java/3.21.7/protobuf-java-3.21.7.jar -P ./
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer
DYLD_LIBRARY_PATH=./test:${DYLD_LIBRARY_PATH}
java -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.21.7.jar:./onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner
workingDirectory: '$(Build.BinariesDirectory)/final-jar'

4
tools/ci_build/github/azure-pipelines/templates/mac-ci.yml
View file

@ -32,7 +32,7 @@ jobs:
CCACHE_DIR: $(Pipeline.Workspace)/ccache
TODAY: $[format('{0:dd}{0:MM}{0:yyyy}', pipeline.startTime)]
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
timeoutInMinutes: 300
steps:
- checkout: self
@ -74,7 +74,7 @@ jobs:
export ONNX_ML=1
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer
displayName: 'Install dependencies'
- script: |

8
tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml
View file

@ -308,7 +308,7 @@ stages:
workspace:
clean: all
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
MACOSX_DEPLOYMENT_TARGET: '10.15'
strategy:
@ -342,7 +342,7 @@ stages:
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
export _PYTHON_HOST_PLATFORM=macosx-${{variables.MACOSX_DEPLOYMENT_TARGET}}-x86_64
python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --config Release --skip_onnx_tests --build_wheel ${{ parameters.build_py_parameters }}
displayName: 'Command Line Script'
@ -368,7 +368,7 @@ stages:
workspace:
clean: all
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
MACOSX_DEPLOYMENT_TARGET: '11.0'
strategy:
@ -413,7 +413,7 @@ stages:
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
export _PYTHON_HOST_PLATFORM=macosx-${{variables.MACOSX_DEPLOYMENT_TARGET}}-arm64
python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --config Release --skip_tests --cmake_extra_defines CMAKE_OSX_ARCHITECTURES=arm64 --build_wheel ${{ parameters.build_py_parameters }}
displayName: 'Command Line Script'

2
tools/ci_build/github/azure-pipelines/templates/react-native-ci.yml
View file

@ -37,7 +37,7 @@ jobs:
- job: ReactNative_CI
pool:
vmImage: 'macOS-11'
vmImage: 'macOS-12'
variables:
runCodesignValidationInjection: false
dependsOn: