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

Update OrtApi 17 marker #19897

Merged
merged 2 commits into from
Mar 18, 2024
Merged

Update OrtApi 17 marker #19897

merged 2 commits into from
Mar 18, 2024

Conversation

YUNQIUGUO
Copy link
Contributor

Description

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

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.

@YUNQIUGUO YUNQIUGUO requested review from snnn and pranavsharma March 13, 2024 18:19
snnn
snnn previously approved these changes Mar 13, 2024
pranavsharma
pranavsharma previously approved these changes Mar 14, 2024
Copy link
Contributor

@pranavsharma pranavsharma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.17.2 is already released. You want to merge this into 1.17.3.

@snnn
Copy link
Member

snnn commented Mar 14, 2024

@pranavsharma The 1.17.2 tag is not created yet.

@YUNQIUGUO
Copy link
Contributor Author

YUNQIUGUO commented Mar 14, 2024

looks like the required tensorRT pipeline is failing. wanted to get this pr checked in @snnn are you aware of any fixes that probably needs to get cherry-picked in for this branch? (i.e. fixes happened after branch rel-1.17.2)

@snnn
Copy link
Member

snnn commented Mar 14, 2024

Please cherry-pick #19880 .

fix build break caused by image update. tensorrt isn't expected to pass
all onnx node tests.
@YUNQIUGUO YUNQIUGUO dismissed stale reviews from pranavsharma and snnn via f0c359c March 15, 2024 01:03
@YUNQIUGUO
Copy link
Contributor Author

@pranavsharma need another approval:)

@YUNQIUGUO YUNQIUGUO merged commit 633c22f into rel-1.17.2 Mar 18, 2024
102 of 107 checks passed
@YUNQIUGUO YUNQIUGUO deleted the yguo/c-api-version-chunk-update branch March 18, 2024 18:38
fs-eire pushed a commit that referenced this pull request Mar 21, 2024
### 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 fs-eire mentioned this pull request Mar 21, 2024
fs-eire added a commit that referenced this pull request Mar 22, 2024
### 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`.

@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.

Co-authored-by: Rachel Guo <[email protected]>
Co-authored-by: rachguo <[email protected]>
Co-authored-by: George Wu <[email protected]>
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