Rebase rel-1.17.3 #20006
Merged
Rebase rel-1.17.3 #20006
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Description <!-- Describe your changes. --> Looks like a bunch of new C OrtApis are introduced in 1.17.0 time frame, however the static assert sanity check has not been updated along the prs. Fix OrtApi marker. Related issue: #19893 ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> The branch is checked out against rel-1.17.2. Once rel-1.17.3 is made, it will be based on this right version. --------- Co-authored-by: rachguo <[email protected]> Co-authored-by: George Wu <[email protected]>
fs-eire
requested review from
pranavsharma and
snnn
and removed request for
pranavsharma
snnn
approved these changes
Mar 21, 2024
pranavsharma
approved these changes
Mar 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
the release branch
rel-1.17.3is created based onrel-1.17.2last week. However, there are latest code change merged intorel-1.17.2: #19897. The branchrel-1.17.3is protected so no push or delete can be performed on it.This PR cherry-picks the commit 633c22f based on 6bc6adc to make sure the base of
rel-1.17.3matchesrel-1.17.2.@snnn @pranavsharma This operation will ensure the code base contains same code, but the git history will not be exactly same. If you want it to be exactly same, I need your help to do a git rebase or delete and recreate the branch.