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

Remove reference to numpy.typing #4277

Merged
merged 7 commits into from Jun 15, 2022
Merged

Conversation

justinchuby
Copy link
Contributor

@justinchuby justinchuby commented Jun 15, 2022

Description

Remove reference to numpy.typing

Motivation and Context

onnx supports numpy > 1.16 (from requirements.txt) but numpy.typing is introduced in 1.20. The PR removes numpy.typing and instead creates the _ShapeLike type.

  • It also corrects the return type for combine_pairs_to_complex
  • Removes unused import helper

Needed for the 1.12 release

etiotto and others added 3 commits June 15, 2022 10:03
* bump version to 1.12.0

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

* Remove trailing white space

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>
@jcwchen jcwchen added the run release CIs Use this label to trigger release tests in CI label Jun 15, 2022
@garymm garymm added this to the 1.12 milestone Jun 15, 2022
@justinchuby
Copy link
Contributor Author

@jcwchen we prob need a newer version of typing_extensions: python/typing#724

onnx/numpy_helper.py Outdated Show resolved Hide resolved
justinchuby and others added 2 commits June 15, 2022 10:57
Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>
onnx/numpy_helper.py Outdated Show resolved Hide resolved
Copy link
Member

@jcwchen jcwchen left a comment

Choose a reason for hiding this comment

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

Thank you @justinchuby for the quick fix! To prevent similar issues in the future, I add the verification for the minimum supported NumPy version in CIs by this PR. Hopefully in the future we can catch this issue in ONNX CIs first.

@jcwchen jcwchen merged commit 31b77d4 into onnx:main Jun 15, 2022
@justinchuby justinchuby deleted the justinchu/typing branch June 15, 2022 19:19
@justinchuby
Copy link
Contributor Author

Could you update the rc so that it can be tested in pytorch?

liqunfu pushed a commit that referenced this pull request Jun 15, 2022
* bump version to 1.12.0 (#4209)

* bump version to 1.12.0

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

* Remove trailing white space

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update onnx/numpy_helper.py

Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* syntax

Signed-off-by: Justin Chu <justinchu@microsoft.com>

Co-authored-by: Ettore Tiotto <etiotto@gmail.com>
Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
liqunfu pushed a commit that referenced this pull request Jun 15, 2022
* bump version to 1.12.0 (#4209)

* bump version to 1.12.0

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

* Remove trailing white space

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update onnx/numpy_helper.py

Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* syntax

Signed-off-by: Justin Chu <justinchu@microsoft.com>

Co-authored-by: Ettore Tiotto <etiotto@gmail.com>
Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Liqun Fu <liqfu@microsoft.com>
broune pushed a commit to broune/onnx that referenced this pull request May 6, 2023
* bump version to 1.12.0 (onnx#4209)

* bump version to 1.12.0

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

* Remove trailing white space

Signed-off-by: Ettore Tiotto <etiotto@ca.ibm.com>

Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update onnx/numpy_helper.py

Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Signed-off-by: Justin Chu <justinchu@microsoft.com>

* Update numpy_helper.py

Signed-off-by: Justin Chu <justinchu@microsoft.com>

* syntax

Signed-off-by: Justin Chu <justinchu@microsoft.com>

Co-authored-by: Ettore Tiotto <etiotto@gmail.com>
Co-authored-by: Chun-Wei Chen <jacky82226@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
run release CIs Use this label to trigger release tests in CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants