Make get_symbol(large_number) work in Python2 #48
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
dgasmith
reviewed
Aug 23, 2018
| @@ -117,15 +117,14 @@ def test_drop_in_replacement(string): | |||
| assert np.allclose(opt, np.einsum(string, *views)) | |||
|
|
|||
|
|
|||
| @pytest.mark.skipif(sys.version_info[0] < 3, reason='requires python3') | |||
| @pytest.mark.parametrize("string", tests) | |||
There was a problem hiding this comment.
Thanks, I think there are two more in this file. I think this is good to go after those are patched?
There was a problem hiding this comment.
Great, I believe this is good to go now. Looking forward to using this in Pyro.
dgasmith
approved these changes
Aug 23, 2018
| @@ -129,7 +129,7 @@ def cached_einsum(*args, **kwargs): | |||
| canonical = sorted(zip(inputs, map(id, operands)), key=lambda x: x[1]) | |||
| canonical_ids = tuple(id_ for _, id_ in canonical) | |||
| canonical_inputs = ','.join(input_ for input_, _ in canonical) | |||
| canonical_equation = alpha_canonicalize('{}->{}'.format(canonical_inputs, output)) | |||
There was a problem hiding this comment.
Any reason to avoid format here?
There was a problem hiding this comment.
Yes, 'blah {}'.format(u'\x80') fails in Python 2. I couldn't figure out how to write a test for this, but it fixed my error in an application.
|
@dgasmith Yes, I think this is ready to squash-and-merge. |
dgasmith
pushed a commit
that referenced
this pull request
Aug 23, 2018
* Make get_symbol(large_number) work in Python2 * Enable fixed tests * Simplify shim * Enable more tests * Avoid .format() in einsum_cache_wrap
|
@fritzo PyPI packages are up, works for me on Py2.7/3.6. Let me know if you have issues! Conda-forge packages will take a day or so. |
|
@dgasmith Thanks for the speedy response! |
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.
Fixes #42
Description
This provides a compatibility shim for Python 2 so that
get_symbol(n)can work for larger n.Note that Python 2's
numpy.einsumstill does not accept unicode. This means that, whileopt_einsumcan now work with arbitrarily large contractions in Python 2, it only works with contractions whose individual calls to Numpy involve fewer than 52 (I believe) characters.Tested
Status