Skip to content

Update onnx to work with numpy>=2.0 #6196

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
Merged
merged 29 commits into from
Jul 3, 2024
Merged

Update onnx to work with numpy>=2.0 #6196

merged 29 commits into from
Jul 3, 2024

Conversation

xadupre
Copy link
Contributor

@xadupre xadupre commented Jun 21, 2024 •
edited by justinchuby
Loading

Description

onnx compiled with numpy 1.x does not work with numpy 2.0. onnx compiled with numpy 2.0 works numpy 1.x.

Fixes #6136 Fixes #6197

@xadupre
Try numpy 2.0
b2c1f1c 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre xadupre requested review from a team as code owners June 21, 2024 09:51
xadupre added 3 commits June 21, 2024 11:53
@xadupre
fix conflict
aae0061 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
Fix cast issues
270b447 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
fix doc
1f7a684 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
github-advanced-security[bot]
github-advanced-security bot found potential problems Jun 21, 2024
View reviewed changes
xadupre added 2 commits June 21, 2024 13:16
@xadupre
misspelling
63850f9 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
fix type issues
3bc4306 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@justinchuby justinchuby added the run release CIs Use this label to trigger release tests in CI label Jun 21, 2024
justinchuby
justinchuby approved these changes Jun 21, 2024
View reviewed changes
Copy link
Member

@justinchuby justinchuby left a comment

Choose a reason for hiding this comment

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

Thanks! Do we specify numpy>2.0 explicitly somewhere in the release pipeline too? If not should we do it?

xadupre added 3 commits June 21, 2024 15:12
@xadupre
lint
5953af7 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
atolrtol
8a233e9 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
ref
0bd649f 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@justinchuby
Copy link
Member

Fixes #6136 ?

@xadupre
improve unit test
e4437d6 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
Copy link
Contributor Author

xadupre commented Jun 21, 2024

Fixes #6136 ?

It should.

github-advanced-security[bot]
github-advanced-security bot found potential problems Jun 21, 2024
View reviewed changes
xadupre added 2 commits June 21, 2024 15:45
@xadupre
fix ut
80ddebd 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
other series of updates
7bcb8d0 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
github-advanced-security[bot]
github-advanced-security bot found potential problems Jun 21, 2024
View reviewed changes
@xadupre xadupre self-assigned this Jun 21, 2024
xadupre added 3 commits June 21, 2024 19:23
@xadupre
Merge branch 'main' of https://github.com/onnx/onnx into np20
dbda5d4
@xadupre
update onnx
48c2f75 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
lint
a03faf4 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@codecov Codecov
Copy link

codecov bot commented Jun 21, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 36.84211% with 36 lines in your changes missing coverage. Please review.

Project coverage is 57.07%. Comparing base (83194ed) to head (abb8db9).
Report is 59 commits behind head on main.

Files Patch % Lines
onnx/backend/test/case/node/deformconv.py 0.00% 8 Missing ⚠️
onnx/backend/test/loader/__init__.py 28.57% 4 Missing and 1 partial ⚠️
onnx/backend/test/case/node/stft.py 0.00% 3 Missing ⚠️
onnx/backend/test/case/node/unique.py 0.00% 3 Missing ⚠️
onnx/backend/test/case/node/blackmanwindow.py 0.00% 2 Missing ⚠️
onnx/backend/test/case/node/hammingwindow.py 0.00% 2 Missing ⚠️
onnx/backend/test/case/node/hannwindow.py 0.00% 2 Missing ⚠️
onnx/test/test_backend_onnxruntime.py 0.00% 2 Missing ⚠️
onnx/backend/test/case/model/sequence.py 0.00% 1 Missing ⚠️
onnx/backend/test/case/node/adagrad.py 0.00% 1 Missing ⚠️
... and 7 more
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6196      +/-   ##
==========================================
+ Coverage   56.95%   57.07%   +0.11%     
==========================================
  Files         506      506              
  Lines       30467    31061     +594     
  Branches     4592     4620      +28     
==========================================
+ Hits        17353    17728     +375     
- Misses      12285    12505     +220     
+ Partials      829      828       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

xadupre added 4 commits June 21, 2024 19:47
@xadupre
ci
c9ac269 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
missing
9a763d9 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
np
b3da7d0 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
lint
1395ce1 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
lint
95866ca 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@justinchuby justinchuby added the auto update doc Generate md/proto files automatically using the CI pipeline label Jun 21, 2024
xadupre added 7 commits June 23, 2024 13:31
@xadupre
doc
0ad784f 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
lint
10aae23 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
lint
c9a12ac 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
lint
fb18fd4 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
update cmake
f772b90 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
update pybind11 version
d6d450e 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
@xadupre
fix yaml
53d5f86 
Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
justinchuby
justinchuby reviewed Jun 24, 2024
View reviewed changes
@justinchuby justinchuby changed the title Compile onnx with numpy>=2.0 Test onnx with numpy>=2.0 Jun 24, 2024
@xadupre xadupre enabled auto-merge June 25, 2024 07:36
@xadupre xadupre changed the title Test onnx with numpy>=2.0 Update onnx to work with numpy>=2.0 Jun 25, 2024
@xadupre xadupre mentioned this pull request Jun 27, 2024
Closed
@xadupre xadupre requested review from gramalingam and wschin June 27, 2024 08:09
xadupre added 2 commits July 3, 2024 11:29
justinchuby
justinchuby reviewed Jul 3, 2024
View reviewed changes
@xadupre xadupre added this pull request to the merge queue Jul 3, 2024
Merged via the queue into onnx:main with commit e537130 Jul 3, 2024
@xadupre xadupre deleted the np20 branch July 3, 2024 17:09
@cjvolzka cjvolzka mentioned this pull request Jul 19, 2024
Closed
andife pushed a commit to andife/onnx that referenced this pull request Jul 20, 2024
@xadupre @andife
Update onnx to work with numpy>=2.0 (onnx#6196)
f00456b 
### Description
onnx compiled with numpy 1.x does not work with numpy 2.0. onnx compiled
with numpy 2.0 works numpy 1.x.

Fixes onnx#6136 Fixes
onnx#6197

---------

Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
Signed-off-by: Andreas Fehlner <fehlner@arcor.de>
@andife andife mentioned this pull request Jul 26, 2024
Merged
linshokaku pushed a commit to linshokaku/onnx that referenced this pull request Oct 2, 2024
@xadupre @linshokaku
Update onnx to work with numpy>=2.0 (onnx#6196)
2fbc9ed 
### Description
onnx compiled with numpy 1.x does not work with numpy 2.0. onnx compiled
with numpy 2.0 works numpy 1.x.

Fixes onnx#6136 Fixes
onnx#6197

---------

Signed-off-by: Xavier Dupre <xadupre@microsoft.com>
Signed-off-by: Linsho Kaku <linsho@preferred.jp>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinchuby justinchuby justinchuby approved these changes

@liqunfu liqunfu liqunfu approved these changes

@gramalingam gramalingam gramalingam approved these changes

@wschin wschin Awaiting requested review from wschin

Assignees

@xadupre xadupre

Labels
auto update doc Generate md/proto files automatically using the CI pipeline run release CIs Use this label to trigger release tests in CI
Projects
PR Tracker
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Compatibility with numpy>=2.0 Numpy 2.0.0rc2 causes pytest on ONNX to fail
4 participants
@xadupre @justinchuby @liqunfu @gramalingam