Skip to content

Commit 96a7194

Browse files
ssk18ssk18
authored
Merge branch 'main' into enable-16KB-for-android
2 parents 9b31d4d + 7387a4e commit 96a7194

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1607
-102
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ build_host_protoc
55
build_android
66
build_ios
77
build_*
8+
build.*
89
.venv/
910
_subbuild/
1011
.build_debug/*

‎.pipelines/android_packaging.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
jobs:
44
- job: AndroidPackaging
55
pool:
6-
vmImage: "macOS-13"
6+
vmImage: "macOS-14"
77
timeoutInMinutes: 150
88
variables:
99
buildConfig: Release

‎.pipelines/ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ stages:
205205
###########
206206
- job: MacOSX
207207
pool:
208-
vmImage: 'macOS-13'
208+
vmImage: 'macOS-14'
209209

210210
strategy:
211211
matrix:
@@ -256,7 +256,7 @@ stages:
256256
##############################
257257
- job: MacOS_PPApiBuild
258258
pool:
259-
vmImage: 'macOS-13'
259+
vmImage: 'macOS-14'
260260

261261
steps:
262262
# compiled as only one operator selected.
@@ -272,7 +272,7 @@ stages:
272272
#############
273273
- job: MacOSPython
274274
pool:
275-
vmImage: 'macOS-13'
275+
vmImage: 'macOS-14'
276276

277277
strategy:
278278
matrix:
@@ -379,7 +379,7 @@ stages:
379379
380380
- script: |
381381
call $(vsdevcmd)
382-
call .\build.bat -DOCOS_ENABLE_CTEST=ON -DOCOS_ONNXRUNTIME_VERSION="$(ort.version)" -DONNXRUNTIME_PKG_DIR=.\onnxruntime-win-x64-$(ort.version)
382+
call .\build.bat -DOCOS_ENABLE_CTEST=ON -DOCOS_ONNXRUNTIME_VERSION="$(ort.version)" -DONNXRUNTIME_PKG_DIR=.\onnxruntime-win-x64-$(ort.version) -DOCOS_ENABLE_C_API=ON
383383
displayName: build the customop library with onnxruntime
384384
385385
- script: |
@@ -536,7 +536,7 @@ stages:
536536
call .\build.bat -T cuda="%CUDA_PATH%" -DOCOS_ENABLE_CTEST=ON^
537537
-DCMAKE_CUDA_FLAGS_INIT=-allow-unsupported-compiler^
538538
-DOCOS_USE_CUDA=ON -DCMAKE_CUDA_ARCHITECTURES=70;86^
539-
-DOCOS_ONNXRUNTIME_VERSION="$(ORT_VERSION)" -DONNXRUNTIME_PKG_DIR=.\onnxruntime-win-x64-gpu-$(ORT_VERSION)
539+
-DOCOS_ONNXRUNTIME_VERSION="$(ORT_VERSION)" -DONNXRUNTIME_PKG_DIR=.\onnxruntime-win-x64-gpu-$(ORT_VERSION) -DOCOS_ENABLE_C_API=ON
540540
displayName: build the customop library with onnxruntime
541541
542542
- script: |
@@ -722,7 +722,7 @@ stages:
722722
#############
723723
- job: AndroidPackage_BuildOnly
724724
pool:
725-
vmImage: 'macOS-13'
725+
vmImage: 'macOS-14'
726726
timeoutInMinutes: 120
727727
steps:
728728
- task: UsePythonVersion@0
@@ -757,7 +757,7 @@ stages:
757757
758758
- job: AndroidCpp_BuildOnly
759759
pool:
760-
vmImage: 'macOS-13'
760+
vmImage: 'macOS-14'
761761
timeoutInMinutes: 45
762762
steps:
763763
- task: UsePythonVersion@0
@@ -796,7 +796,7 @@ stages:
796796
#############
797797
- job: IosPackage
798798
pool:
799-
vmImage: 'macOS-13'
799+
vmImage: 'macOS-14'
800800
timeoutInMinutes: 120
801801
steps:
802802
- template: templates/use-xcode-version.yml
@@ -822,7 +822,7 @@ stages:
822822
--output_dir $(Build.BinariesDirectory)/xcframework_out \
823823
--platform_arch iphonesimulator x86_64 \
824824
--config RelWithDebInfo \
825-
--ios_deployment_target 13.0 \
825+
--ios_deployment_target 15.0 \
826826
-- \
827827
--enable_cxx_tests
828828
displayName: "Build xcframework for iphonesimulator x86_64"
@@ -847,7 +847,7 @@ stages:
847847
- script: |
848848
set -e
849849
850-
SIMULATOR_DEVICE_INFO=$(python ./tools/ios/get_simulator_device_info.py)
850+
SIMULATOR_DEVICE_INFO=$(python ./tools/ios/get_simulator_device_info.py --requested-runtime-version 18.2)
851851
852852
echo "Simulator device info:"
853853
echo "${SIMULATOR_DEVICE_INFO}"

‎.pipelines/ci_optional.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ stages:
2929
#############
3030
- job: AndroidPackage
3131
pool:
32-
vmImage: 'macOS-13'
32+
vmImage: 'macOS-14'
3333
timeoutInMinutes: 120
3434
steps:
3535
- task: UsePythonVersion@0
@@ -78,7 +78,7 @@ stages:
7878
7979
- job: AndroidCpp
8080
pool:
81-
vmImage: 'macOS-13'
81+
vmImage: 'macOS-14'
8282
timeoutInMinutes: 30
8383
steps:
8484
- task: UsePythonVersion@0

‎.pipelines/ios_packaging.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
displayName: "iOS Packaging"
1212

1313
pool:
14-
vmImage: "macOS-13"
14+
vmImage: "macOS-14"
1515

1616
timeoutInMinutes: 180
1717

‎.pipelines/java_packaging.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ stages:
107107
workspace:
108108
clean: all
109109
pool:
110-
vmImage: 'macOS-13'
110+
vmImage: 'macOS-14'
111111

112112
steps:
113113
- task: PowerShell@2

‎.pipelines/templates/android-shared-lib-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ parameters:
2121
jobs:
2222
- job: Android_C_API_Packaging_${{ parameters.JobSuffix }}
2323
pool:
24-
vmImage: "macOS-13"
24+
vmImage: "macOS-14"
2525
timeoutInMinutes: 120
2626
variables:
2727
buildConfig: Release

‎.pipelines/templates/build-package-for-android-aar.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ stages:
4040
- Android_C_API_Packaging_armeabi_v7a
4141
- Android_C_API_Packaging_arm64_v8a
4242
pool:
43-
vmImage: 'macOS-13'
43+
vmImage: 'macOS-14'
4444
timeoutInMinutes: 120
4545
variables:
4646
buildConfig: Release

‎.pipelines/templates/build-package-for-ios-cocoapods.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,39 @@ jobs:
1616
parameters:
1717
Platform: 'iphoneos'
1818
IosArch: 'arm64'
19-
IosVersion: '12.0'
19+
IosVersion: '15.0'
2020
IsReleaseBuild: ${{parameters.IsReleaseBuild}}
2121
AdditionalBuildFlags: ${{parameters.AdditionalBuildFlags}}
2222

2323
- template: ios-framework-build.yml
2424
parameters:
2525
Platform: 'iphonesimulator'
2626
IosArch: 'x86_64'
27-
IosVersion: '12.0'
27+
IosVersion: '15.0'
2828
IsReleaseBuild: ${{parameters.IsReleaseBuild}}
2929
AdditionalBuildFlags: ${{parameters.AdditionalBuildFlags}}
3030

3131
- template: ios-framework-build.yml
3232
parameters:
3333
Platform: 'iphonesimulator'
3434
IosArch: 'arm64'
35-
IosVersion: '12.0'
35+
IosVersion: '15.0'
3636
IsReleaseBuild: ${{parameters.IsReleaseBuild}}
3737
AdditionalBuildFlags: ${{parameters.AdditionalBuildFlags}}
3838

3939
- template: ios-framework-build.yml
4040
parameters:
4141
Platform: 'maccatalyst'
4242
IosArch: 'arm64'
43-
IosVersion: '14.0'
43+
IosVersion: '15.0'
4444
IsReleaseBuild: ${{parameters.IsReleaseBuild}}
4545
AdditionalBuildFlags: ${{parameters.AdditionalBuildFlags}}
4646

4747
- template: ios-framework-build.yml
4848
parameters:
4949
Platform: 'maccatalyst'
5050
IosArch: 'x86_64'
51-
IosVersion: '14.0'
51+
IosVersion: '15.0'
5252
IsReleaseBuild: ${{parameters.IsReleaseBuild}}
5353
AdditionalBuildFlags: ${{parameters.AdditionalBuildFlags}}
5454

@@ -62,7 +62,7 @@ jobs:
6262
- IOS_C_API_Packaging_maccatalyst_x86_64
6363
- IOS_C_API_Packaging_maccatalyst_arm64
6464
pool:
65-
vmImage: "macOS-13"
65+
vmImage: "macOS-14"
6666

6767
timeoutInMinutes: 120
6868

‎.pipelines/templates/build-package-for-linux.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@ jobs:
3535
submodules: none
3636

3737
- bash: |
38-
sudo apt-get update
39-
sudo apt-get install -y libssh-dev
38+
if [ "${{parameters.OrtExtensionsArch}}" == "x64" ]; then
39+
sudo apt-get update
40+
sudo apt-get install -y libssh-dev
41+
else
42+
sudo dnf update -y
43+
sudo dnf install -y libssh-devel
44+
fi
4045
displayName: Install OpenSSL for Azure custom ops
4146
4247
# NOTE: on arm64 machine, CMake version needs to be updated since we now require CMake 3.28 or newer.
@@ -49,8 +54,12 @@ jobs:
4954
displayName: 'build onnxruntime-extensions and run tests'
5055
- ${{ else }}:
5156
- bash: |
52-
sudo apt remove cmake
53-
pip install cmake --upgrade
57+
if ! dnf list installed cmake &>/dev/null; then
58+
echo "CMake is not installed. Installing/upgrading cmake."
59+
pip install cmake --upgrade
60+
else
61+
echo "CMake is already installed."
62+
fi
5463
export PATH=~/.local/bin:$PATH
5564
cmake --version
5665
export CFLAGS="${{parameters.OrtExtensionsCFlags}}"

0 commit comments

Comments
 (0)