BUG: f2py: fix f2py generated code to work on Pypy #10657
Merged
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
F2py generates code that uses PyTuple_SetItem on a tuple that has been "used", which is invalid on Pypy. Add #ifdefs that make the generated code convert the object to a list, use PyList_SetItem, and then convert it back to a tuple.
charris
reviewed
Feb 24, 2018
| #ifdef PYPY_VERSION | ||
| \tcapi_return = PyObject_CallObject(#name#_capi,(PyObject *)capi_arglist_list); | ||
| \tPy_DECREF(capi_arglist_list); | ||
| \tcapi_arglist_list = NULL; |
There was a problem hiding this comment.
Yes, in case there's a jump to capi_fail below.
|
We should really replace the |
charris
added
component: numpy.f2py
24 - PyPy
09 - Backport-Candidate
|
Thanks Pauli. |
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.
F2py generates code that uses PyTuple_SetItem on a tuple that has been
"used", which is invalid on Pypy.
Add #ifdefs that make the generated code convert the object to a list,
use PyList_SetItem,
and then convert it back to a tuple before it is usedand use itas an argument list in a function call.
This enables scipy.linalg tests to pass on pypy. There is no change of behavior on non-pypy.