Skip to content

Rebase rel-1.17.3 - #20006

Merged
Yulong Wang (fs-eire) merged 1 commit into
rel-1.17.3from
fs-eire/rel-1.17.3-sync
Mar 22, 2024
Merged

Yulong Wang (fs-eire) merged 1 commit into
rel-1.17.3from
fs-eire/rel-1.17.3-sync

Conversation

@fs-eire

Copy link
Copy Markdown
Contributor

Description

the release branch rel-1.17.3 is created based on rel-1.17.2 last week. However, there are latest code change merged into rel-1.17.2: #19897. The branch rel-1.17.3 is 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.3 matches rel-1.17.2.

Changming Sun (@snnn) Pranav Sharma (@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.

### 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 <rachguo@rachguos-Mini.attlocal.net>
Co-authored-by: George Wu <jywu@microsoft.com>
@fs-eire
Yulong Wang (fs-eire) merged commit dbf1a8c into rel-1.17.3 Mar 22, 2024
@fs-eire
Yulong Wang (fs-eire) deleted the fs-eire/rel-1.17.3-sync branch March 22, 2024 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants