Handle exceptions in numpy::array_view<...>::set(). #25850
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
QuLogic
reviewed
May 10, 2023
set() can throw an exception; we must check for that to properly get
that exception propagated to the python side; otherwise we get a
SystemError ("method ... returned a result with an exception set").
Example repro:
```
from pylab import *
gca().add_collection(mpl.collections.LineCollection(rand(2, 2, 2), array=0))
```
(Here the C extension method receives a single tuple (rgba) color rather
than an array of tuple (rgba) colors.)
I'd rather not explicitly test for the exception being raised (a
ValueError) because if switching to pybind11 one naturally gets a
broadcast of the scalar value into a correctly dimensionalized array;
indeed mplcairo handles the above example just fine.
5 tasks
QuLogic
approved these changes
May 25, 2023
ksunden
approved these changes
Jun 3, 2023
|
Owee, I'm MrMeeseeks, Look at me. There seem to be a conflict, please backport manually. Here are approximate instructions:
And apply the correct labels and milestones. Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon! Remember to remove the If these instructions are inaccurate, feel free to suggest an improvement. |
|
I'll argue it's not worth a manual backport, the code is significantly enough different. Example conflict (4 very similar such diffs): <<<<<<< HEAD
points->set(obj);
if (points->size() == 0) {
return 1;
}
if (points->dim(1) != 2) {
PyErr_Format(PyExc_ValueError,
"Points must be Nx2 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT,
points->dim(0), points->dim(1));
=======
if (!points->set(obj)
|| points->size() && !check_trailing_shape(*points, "points", 2)) {
>>>>>>> f394597f68 (Merge pull request #25850 from anntzer/exc) |
1 task
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.
set() can throw an exception; we must check for that to properly get that exception propagated to the python side; otherwise we get a SystemError ("method ... returned a result with an exception set"). Example repro:
(Here the C extension method receives a single tuple (rgba) color rather than an array of tuple (rgba) colors.)
I'd rather not explicitly test for the exception being raised (a ValueError) because if switching to pybind11 one naturally gets a broadcast of the scalar value into a correctly dimensionalized array; indeed mplcairo handles the above example just fine.
Also fix an unrelated (harmless) typo in _tkagg.cpp: use a logical or instead of a bitwise or.PR summary
PR checklist