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

1.16.1 cherry picks #6108

Merged
merged 9 commits into from May 9, 2024
Merged

1.16.1 cherry picks #6108

merged 9 commits into from May 9, 2024

Conversation

cjvolzka
Copy link
Contributor

@cjvolzka cjvolzka commented Apr 29, 2024 •
edited

Description

Check-pick commits from main into rel-1.16.1 branch

Motivation and Context

Fix 1.16.0 issues and enabled 1.16.1 builds by cherry-picking the following PRs from main into the 1.16.1 branch

liqunfu and others added 2 commits April 29, 2024 15:09
@liqunfu @cjvolzka
fix a skipped shape infer code (#6049)
416d2f4 
### Description
<!-- - Describe your changes. -->

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

Signed-off-by: Liqun Fu <liqfu@microsoft.com>
(cherry picked from commit fa0b899)
@cjvolzka
Prevent crash on import after GCC 8 builds (#6048)
77b5255 
### Description
Possible fix for #6047 based on
https://stackoverflow.com/questions/33149878/experimentalfilesystem-linker-error/33159746#33159746

### Motivation and Context
I'm not a cmake expert so there may be a better way to do this. This did
allow me to build ONNX 1.16 on RHEL 8.

---------

Signed-off-by: Charles Volzka <cjvolzka@us.ibm.com>
Signed-off-by: Charles Volzka <42243335+cjvolzka@users.noreply.github.com>
Co-authored-by: Thiago Crepaldi <thiago.crepaldi@microsoft.com>
Co-authored-by: G. Ramalingam <grama@microsoft.com>
(cherry picked from commit 3f24ef3)
@cjvolzka cjvolzka requested review from a team as code owners April 29, 2024 20:19
@gramalingam @cjvolzka
Add missing shape inference check for DequantizeLinear (#6080)
fc1fa51 
Add missing `hasInputShape` condition in shape-inference for
DequantizeLinear ... strangely missing in last two versions, but present
in earlier version.

Signed-off-by: G. Ramalingam <grama@microsoft.com>
(cherry picked from commit 5ecc0a9)
@cjvolzka cjvolzka mentioned this pull request Apr 29, 2024
Closed
@cjvolzka
Prepare for rel-1.16.1 branch (#6106)
1f5283b 
### Description
Prepare for rel-1.16.1 branch

### Motivation and Context
Prepare ONNX 1.16.1 release

Signed-off-by: Charles Volzka <cjvolzka@us.ibm.com>
(cherry picked from commit d6f8712)
@cjvolzka cjvolzka added this to the 1.16.1 milestone Apr 30, 2024
@mayeut @cjvolzka
chore(ci): build and test macOS universal2 wheels on macOS arm64 (#6117)
1fc5eb8 
### Description
Build and test macOS universal2 wheels on macOS arm64
Removes x86_64 wheels.

### Motivation and Context
`macos-latest` runners moved to macOS 14 running on arm64 hardware.
This is breaking the macOS release pipeline.

This PR rewrites the macOS release pipeline in 2 parts:
- Build universal2 wheels on `macos-latest`
- Test both arm64 & x86_64 parts of the universal2 wheel on
`macos-latest`

The x86_64 wheels have been removed as the universal2 ones can be used
on x86_64.

close #6105

---------

Signed-off-by: Matthieu Darbois <mayeut@users.noreply.github.com>
Signed-off-by: Justin Chu <justinchuby@users.noreply.github.com>
Co-authored-by: Justin Chu <justinchuby@users.noreply.github.com>
(cherry picked from commit 1529880)
@cjvolzka
Copy link
Contributor Author

cjvolzka commented May 2, 2024

I cherry-picked the fix for the MacRelease actions. Based on it's description, it looks like I'm hitting on #6120 as I'm seeing on LinuxRelease_x86_64 results:

  note: This error originates from a subprocess, and is likely not a problem with pip.
  ERROR: Failed building wheel for google-re2
ERROR: Could not build wheels for google-re2, which is required to install pyproject.toml-based projects
+ echo 'Installing Python requirements failed.'
Installing Python requirements failed.
+ exit 1

1 similar comment
@cjvolzka
Copy link
Contributor Author

cjvolzka commented May 2, 2024

I cherry-picked the fix for the MacRelease actions. Based on it's description, it looks like I'm hitting on #6120 as I'm seeing on LinuxRelease_x86_64 results:

  note: This error originates from a subprocess, and is likely not a problem with pip.
  ERROR: Failed building wheel for google-re2
ERROR: Could not build wheels for google-re2, which is required to install pyproject.toml-based projects
+ echo 'Installing Python requirements failed.'
Installing Python requirements failed.
+ exit 1

@adrianlizarraga @cjvolzka
Fix input names for quantize/dequantize ONNX backend tests (#6122)
00f1891 
### Description
#6123
The input pb files for the following ONNX backend node tests have
incorrect names that do not match the ONNX model:
- test_dequantizelinear_uint4
- test_dequantizelinear_int4
- test_quantizelinear_e4m3fn
- test_quantizelinear_e5m2
- test_quantizelinear_uint4
- test_quantizelinear_int4

### Motivation and Context
The mismatch in input names causes issues when running these backend
tests via ONNX Runtime.

---------

Signed-off-by: Adrian Lizarraga <adlizarraga@microsoft.com>
(cherry picked from commit 3bddb4d)
@cjvolzka cjvolzka mentioned this pull request May 3, 2024
Merged
mayeut added 2 commits May 6, 2024 13:37
@mayeut @cjvolzka
fix(ci): install python dependencies with --only-binary :all: in ma…
e59d51c 
…nylinux (#6120)

### Description
Only install python dependencies from wheels in manylinux.

### Motivation and Context
The latest version of google-re2 dropped support for manylinux2014.
google-re2 fails to build from sources thus failing the Linux release
pipelines.

This PR forces installation from wheels on manylinux which thus fallback
on the latest version of google-re2 with a wheel for manylinux2014.

Another solution would be to bump the manylinux images to manylinux_2_28
but that could have impact on downstream users (e.g. impossible to
install wheel from rh7, amazon linux 2, ubuntu 18.04).

Signed-off-by: Matthieu Darbois <mayeut@users.noreply.github.com>
Co-authored-by: Justin Chu <justinchuby@users.noreply.github.com>
(cherry picked from commit 9f6f3a0)
@mayeut @cjvolzka
fix: install google-re2 with --only-binary option (#6129)
0559c8b 
### Description

Only install google-re2 from wheels.

### Motivation and Context

The latest version of google-re2 dropped support for manylinux2014.
google-re2 fails to build from sources thus failing the Linux release
pipelines.

This PR forces installation from wheels on manylinux which thus fallback
on the latest version of google-re2 with a wheel for manylinux2014.
It reverts #6120 which forced all
dependencies to be available as wheels (psutil is not which forbids
installing recent versions of jupyter/ipykernel).

Another solution would be to bump the manylinux images to manylinux_2_28
but that could have impact on downstream users (e.g. impossible to
install wheel from rh7, amazon linux 2, ubuntu 18.04).

Signed-off-by: Matthieu Darbois <mayeut@users.noreply.github.com>
(cherry picked from commit aa2cdac)
@cjvolzka
Copy link
Contributor Author

cjvolzka commented May 7, 2024

@justinchuby any idea why the Linux/MacOS/Windows-CI tests are staying at "expected"? Is there another commit from main I need to pull related to that? (also affects #6107)

@justinchuby
Copy link
Contributor

Could be that the branch rules for rel-* branches were not modified to remove the azure devop checks. @prasanthpul has the access to adjust the branch protection rules.

@cjvolzka
Copy link
Contributor Author

cjvolzka commented May 9, 2024

Could be that the branch rules for rel-* branches were not modified to remove the azure devop checks. @prasanthpul has the access to adjust the branch protection rules.

@prasanthpul, have you had a chance to look at the branch protection rules for rel-* branches? Once you do, let me know because I think the PRs will need to be run again before they reflect the change.

@justinchuby
Copy link
Contributor

@cjvolzka you may also want to bring in #6075

@justinchuby @cjvolzka
Migrate CI to use Github Actions (#6075)
84fe50a 
Migrate CI to use Github Actions. Update Google Test to a newer version
(some version in 2022). The latest commit has errors I don't know how to
fix.

Use `FetchContent` instead of `ExternalProject` to bring in googletest
according to its documentation
https://google.github.io/googletest/quickstart-cmake.html

Fixes #6074 Fixes
#6073

---------

Signed-off-by: Justin Chu <justinchuby@users.noreply.github.com>
(cherry picked from commit 284b124)
@github-actions GitHub Actions
Copy link

github-actions bot commented May 9, 2024

Test Results

     3 files       3 suites   2m 5s ⏱️
 7 452 tests  4 422 ✅ 3 030 💤 0 ❌
22 339 runs  13 159 ✅ 9 180 💤 0 ❌

Results for commit 84fe50a.

@cjvolzka
Copy link
Contributor Author

cjvolzka commented May 9, 2024

Yay! Finally everything passes!
I've had to pull in a few more cherry-picks since the original approval. I updated the description above to match. @justinchuby and @gramalingam I reset your reviews just to confirm the list looks good. Once someone approves the final list, I'll go ahead and merge.

@cjvolzka cjvolzka merged commit 11e7d08 into rel-1.16.1 May 9, 2024
69 checks passed
@cjvolzka cjvolzka deleted the 1.16.1-cherry-picks branch May 9, 2024 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gramalingam gramalingam gramalingam approved these changes

@justinchuby justinchuby justinchuby approved these changes

Assignees

@cjvolzka cjvolzka

Labels
None yet
Projects
PR Tracker
Status: Done
Milestone
1.16.1
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@cjvolzka @justinchuby @gramalingam @liqunfu @mayeut @adrianlizarraga