Properly handle integral types other than plain int #909
Conversation
This file contains 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
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.
In a couple of places, Lasagne has
isinstance(..., int)checks. Those will fail for alongin Python 2 (which appear inndarray.shapeunder Windows), and fornp.int64in Python 3 (which appear innp.prod(ndarray.shape), for example). A generic type check that works both in Python 2 and 3 isisinstance(x, (numbers.Integral, np.integer)).This PR adds
lasagne.utils.int_types, a tuple ofnumbers.Integral, np.integer, and uses it instead ofintwhere appropriate. It also extendslasagne.utils.as_tupleto allow a type tuple instead of a single type.Fixes #847.