-
Notifications
You must be signed in to change notification settings - Fork 59
Fix numpy annotations for pybind v3.0.0 #263
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
Open
sarlinpe
wants to merge
16
commits into
sizmailov:master
Choose a base branch
from
sarlinpe:sarlinpe/test-v3.0.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6afe40e
to
6c42ca3
Compare
8e8a70c
to
8396e1e
Compare
… not throw errors anymore
f0a4df0
to
63f0a13
Compare
63f0a13
to
06f204f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
int
->typing.SupportsInt
and similarly for floatset/list/dict
and generic types intyping
->collections.abc
equivalentFixNumpyArrayDimTypeVar
andFixNumpyArrayDimAnnotation
to handle both old-style (pre-v3.0.0) and new-style annotations.np.ndarray[PRIMITIVE_TYPE[*DIMS], *FLAGS]
typing.Annotated[numpy.typing.ArrayLike, PRIMITIVE_TYPE, "[*DIMS]", "*FLAGS"]
typing.Annotated[numpy.typing.NDArray[PRIMITIVE_TYPE], "[*DIMS]", "*FLAGS"]
typing.Annotated[numpy.typing.ndarray[Any, PRIMITIVE_TYPE], "[*DIMS]", "*FLAGS"]
typing.Annotated[typing.Annotated[NDArray[...]], "[m, n]", "*FLAGS"]
numpy.bool
dtype since v3.0.0 apparently uses it (instead of the nativebool
)parse_annotation_str
not being called on the first nested level of a union, thereby breaking the parsing ofUnion[Annotated[numpy...], None]
--numpy-array-wrap-with-annotated
since v3.0.0 does not anymore throw errors on missing import for dynamic shape variables.Unrelated to v3.0.0 but necessary to run tests locally: ensure the tests are built with the correct C++ standard
These fixes have been working well for us at https://github.com/colmap/colmap
Fixes #264