8000 BUG Numpy ufunc binop fix for subclasses with __numpy_ufunc__ (closes #4815) by mhvk · Pull Request #5748 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG Numpy ufunc binop fix for subclasses with __numpy_ufunc__ (closes #4815) #5748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 6, 2015
Merged

BUG Numpy ufunc binop fix for subclasses with __numpy_ufunc__ (closes #4815) #5748

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
367b409
BUG: core: ensure binop execution uses ufuncs as fallback
pv Jul 24, 2014
6ba4fed
BUG: core: inplace ops don't have corresponding rhs ops, so no need t…
pv Jul 24, 2014
d1153b4
Add tests that __numpy_ufunc__ works with subclasses.
mhvk Apr 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BUG: core: inplace ops don't have corresponding rhs ops, so no need t… 
…o check the slot
  • Loading branch information
@pv @mhvk
pv authored and mhvk committed Apr 5, 2015
commit 6ba4fed3aa26979734faa462e172959fad69723b
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/number.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ needs_right_binop_forward(PyObject *self, PyObject *other,
#define GIVE_UP_IF_HAS_RIGHT_BINOP(m1, m2, left_name, right_name, inplace, slot_name) \
do { \
if (needs_right_binop_forward((PyObject *)m1, m2, right_name, inplace) && \
!SAME_SLOTS(m1, m2, slot_name)) { \
(inplace || !SAME_SLOTS(m1, m2, slot_name))) { \
Py_INCREF(Py_NotImplemented); \
return Py_NotImplemented; \
} \
Expand Down
0