Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Exception in iosDynamicFramework Post-Merge workflow #21262

Merged
merged 20 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/ci_build/github/apple/build_apple_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def _build_for_apple_sysroot(
framework_dir = os.path.join(
build_dir_current_arch,
build_config,
build_config + "-" + sysroot,
((build_config + "-" + sysroot) if sysroot != "macosx" else build_config),
mszhanyi marked this conversation as resolved.
Show resolved Hide resolved
(
"onnxruntime.framework"
if build_dynamic_framework
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"build_osx_archs": {
"iphoneos": [
"arm64"
],
"iphonesimulator": [
"arm64",
"x86_64"
]
},
"build_params": {
"base": [
"--parallel",
"--use_xcode",
"--build_apple_framework",
"--use_coreml",
"--use_xnnpack",
"--skip_tests",
"--cmake_extra_defines=onnxruntime_BUILD_UNIT_TESTS=OFF"
],
"iphoneos": [
"--ios",
"--apple_deploy_target=13.0"
],
"iphonesimulator": [
"--ios",
"--apple_deploy_target=13.0"
]
}
}
9 changes: 7 additions & 2 deletions tools/ci_build/github/azure-pipelines/post-merge-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -446,14 +446,19 @@ stages:
python tools/ci_build/github/apple/build_apple_framework.py \
--build_dir "$(Build.BinariesDirectory)/ios_framework" \
--build_dynamic_framework \
tools/ci_build/github/apple/default_full_apple_framework_build_settings.json
tools/ci_build/github/apple/default_mobile_ios_framework_build_settings.json
edgchen1 marked this conversation as resolved.
Show resolved Hide resolved
displayName: "Build iOS dynamic framework"

- script: |
which realpath || brew install coreutils
mszhanyi marked this conversation as resolved.
Show resolved Hide resolved
displayName: "Install realpath"

- script: |
python tools/ci_build/github/apple/test_apple_packages.py \
--framework_info_file "$(Build.BinariesDirectory)/ios_framework/xcframework_info.json" \
--c_framework_dir "$(Build.BinariesDirectory)/ios_framework/framework_out" \
--variant Full
--variant Full \
--skip_macos_test
displayName: "Test pod with iOS framework"

- stage: IosMinimalTrainingBuild
Expand Down
Loading