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.

Sign up for GitHub

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

Jump to bottom

Add macos platform suppport to onnxruntime-extensions-c pod #622

Merged
merged 13 commits into from
Dec 20, 2023
Merged

Add macos platform suppport to onnxruntime-extensions-c pod #622

merged 13 commits into from
Dec 20, 2023

Conversation

YUNQIUGUO
Copy link
Contributor

@YUNQIUGUO YUNQIUGUO commented Dec 15, 2023 •
edited
Loading

As title.

Motivation:

In order to allow macos support in SPM with one single Package.swift, extensions pod should include macos library support as the best solution though it has not been asked yet.

Note: validated with the dev pod archive as binary target for SPM (with platform macOS and iOS), it works as expected.

Squashed commit of the following:
59a1857 
commit 0bd8a9b
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 16:55:29 2023 -0800

    remove #Preview

commit ac2ecdc
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 15:29:36 2023 -0800

    fix podfile

commit 24bb619
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 15:27:57 2023 -0800

    use pre-release version pod now

commit 9e227da
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 14:09:41 2023 -0800

    update sed

commit 6b9651d
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 13:14:46 2023 -0800

    minor fix

commit 26472d0
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 12:08:42 2023 -0800

    fix pod arch path

commit ba0237e
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 11:13:51 2023 -0800

    update yml files

commit 1d91e17
Author: rachguo <rachguo@rachguos-Mac-mini.local>
Date:   Thu Dec 14 10:25:24 2023 -0800

    add script to substitute podspec file source

commit 248effa
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Thu Dec 14 07:33:21 2023 -0800

    fix pod and update artifacts path

commit 7dfed33
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Thu Dec 14 01:07:43 2023 -0800

    update

commit 834b03f
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Thu Dec 14 00:07:04 2023 -0800

    update directory name

commit ac46342
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Wed Dec 13 23:17:28 2023 -0800

    format

commit 1a10611
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Wed Dec 13 23:16:24 2023 -0800

    copyrights comments and fix .yml format

commit 431682e
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Wed Dec 13 23:05:39 2023 -0800

    add macos testing target in the app and testing ci updates

commit dcd0f30
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Wed Dec 13 14:17:28 2023 -0800

    update opencv.cmake again

commit 28b083c
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Wed Dec 13 11:59:59 2023 -0800

    minor fix

commit d80acda
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Wed Dec 13 11:26:49 2023 -0800

    add zlib to build from source option and minor update

commit dfd37ef
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 19:48:40 2023 -0800

    update podspec.template file

commit b227c2c
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 19:26:40 2023 -0800

    comment out lint pod for now

commit d4bd488
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 18:46:38 2023 -0800

    fix podspec.template

commit a477470
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 15:45:04 2023 -0800

    minor update

commit a07299d
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 11:28:51 2023 -0800

    clean

commit a83642f
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 11:26:50 2023 -0800

    fix merging framework_info.json process

commit 02980fe
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 10:22:42 2023 -0800

    add step for checking the framework_info.json file contents

commit ee224e9
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 09:35:32 2023 -0800

    update to xcframework_info.json

commit 96e1362
Author: rachguo <rachguo@rachguos-Mini.attlocal.net>
Date:   Tue Dec 12 01:06:36 2023 -0800

    add changes for macosx build for extensions pod
@YUNQIUGUO YUNQIUGUO requested a review from a team as a code owner December 15, 2023 01:58
@YUNQIUGUO YUNQIUGUO requested a review from edgchen1 December 15, 2023 01:59
edgchen1
edgchen1 reviewed Dec 15, 2023
View reviewed changes
cmake/externals/opencv.cmake Outdated Show resolved Hide resolved
test/ios/OrtExtensionsUsage/OrtExtensionsMacOSUsage/OrtClient.mm Outdated Show resolved Hide resolved
tools/ios/build_xcframework.py Outdated Show resolved Hide resolved
tools/ios/build_xcframework.py Outdated Show resolved Hide resolved
tools/ios/build_xcframework.py Outdated Show resolved Hide resolved
tools/ios/build_xcframework.py Outdated Show resolved Hide resolved
tools/ios/build_xcframework.py Outdated Show resolved Hide resolved
tools/ios/assemble_pod_package.py Outdated Show resolved Hide resolved
tools/build.py Outdated Show resolved Hide resolved
edgchen1
edgchen1 reviewed Dec 16, 2023
View reviewed changes
tools/build.py Outdated Show resolved Hide resolved
skottmckay
skottmckay reviewed Dec 19, 2023
View reviewed changes
tools/ios/assemble_pod_package.py Outdated Show resolved Hide resolved
tools/ios/build_xcframework.py Outdated Show resolved Hide resolved
@YUNQIUGUO @skottmckay
Update tools/ios/assemble_pod_package.py
1a7c2c0 
Co-authored-by: Scott McKay <skottmckay@gmail.com>
@YUNQIUGUO YUNQIUGUO merged commit fcee38f into main Dec 20, 2023
35 checks passed
@YUNQIUGUO YUNQIUGUO deleted the yguo/extensions-c-macos-PR branch December 20, 2023 02:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edgchen1 edgchen1 edgchen1 left review comments

@skottmckay skottmckay skottmckay approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@YUNQIUGUO @skottmckay @edgchen1