BUG: Fix failures in master related to userdtype registeration#17501
Merged
mattip merged 2 commits intonumpy:masterfrom Oct 8, 2020
Merged
BUG: Fix failures in master related to userdtype registeration#17501mattip merged 2 commits intonumpy:masterfrom
mattip merged 2 commits intonumpy:masterfrom
Conversation
These are now accepted (as a no-op) in `_PyArray_MapPyTypeToDType` retaining previous behaviour (as lookup for a registered user-type was only done if the instance check suceeded. Retain the check for future user DTypes, as it sould be a conscience choice to relax this requirement.
This slightly rearranges the code to ensure that the type number set for a user type is -1 (invalid) if it does not succeed. (This should be unnecessary, but might be relevant in the unlikely event that a usertype does not check the error return correctly.)
seberg
commented
Oct 8, 2020
|
|
||
| with pytest.raises(RuntimeError): | ||
| # Registering a second time should fail | ||
| create_custom_field_dtype(blueprint, mytype, 0) |
Member
Author
There was a problem hiding this comment.
The test only made sense because I mapped the pytype -> dtype, but for legacy user-dtypes where the pytype does not subclass np.generic we actually do not do that, so testing for this error was actually incorrect.
Member
|
Thanks @seberg |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
There are two failures that needed fixing here:
If a legacy user dtype has a
dype.typewhich does not subclass fromnp.generic, we do not use the type during dtype discovery innp.array([...]), so I must not set up such a mapping, but current master did set it up.Because xpress was missing the error, it seemed safer to keep the typenumber as -1 if there is a failure during creating the DType. But I pushed setting the type number too far back, meaning that it ended up as -1 on the DType class. That, together with other changes probably, caused master to fail.
This is the fix instead of the revert in gh-17499