DOC: continuation of PyArray_ResolveIfCopy fixes #10168
Merged
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
charris
reviewed
Dec 6, 2017
| @@ -622,7 +623,11 @@ updates the output array. | |||
| if (arr1 == NULL) return NULL; | |||
| arr2 = PyArray_FROM_OTF(arg2, NPY_DOUBLE, NPY_IN_ARRAY); | |||
| if (arr2 == NULL) goto fail; | |||
| #if NPY_API_VERSION >= 0x0000000c | |||
| oarr = PyArray_FROM_OTF(out, NPY_DOUBLE, NPY_INOUT_ARRAY2); | |||
There was a problem hiding this comment.
Should be NPY_ARRAY_INOUT_ARRAY2, also, above should be NPY_ARRAY_IN_ARRAY in both places.
charris
reviewed
Dec 6, 2017
| @@ -622,7 +623,11 @@ updates the output array. | |||
| if (arr1 == NULL) return NULL; | |||
| arr2 = PyArray_FROM_OTF(arg2, NPY_DOUBLE, NPY_IN_ARRAY); | |||
| if (arr2 == NULL) goto fail; | |||
| #if NPY_API_VERSION >= 0x0000000c | |||
| oarr = PyArray_FROM_OTF(out, NPY_DOUBLE, NPY_INOUT_ARRAY2); | |||
| #else | |||
| oarr = PyArray_FROM_OTF(out, NPY_DOUBLE, NPY_INOUT_ARRAY); | |||
There was a problem hiding this comment.
NPY_ARRAY_INOUT_ARRAY. This documentation is very old ...
[ci skip]
|
Thanks @mattip. |
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.
continuaiton of PR #10166