Skip to content
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

Jump to bottom

BUG: Fix segmentation fault #21436

Merged
merged 3 commits into from
May 6, 2022
Merged

BUG: Fix segmentation fault #21436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73f0885
Fixed #21301
May 3, 2022
42f8ef7
Fixed #21436, better error message, organized test cases as requested
May 4, 2022
447635d
Update numpy/core/src/umath/ufunc_object.c
seberg May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions numpy/core/src/umath/ufunc_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5888,6 +5888,13 @@ ufunc_at(PyUFuncObject *ufunc, PyObject *args)

NPY_BEGIN_THREADS_DEF;

if (ufunc->core_enabled) {
PyErr_Format(PyExc_TypeError,
"numpy.ufunc.at does not support ufunc with non-trivial "\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a nit, but the \ is not necessary :).

We could probably make the error message friendlier by printing out the ufunc name rather than "numpy.ufunc.at". The name is far more interesting than the actual core signature!

"signature: this ufunc has signature %s.", ufunc->core_signature);
return NULL;
}

if (ufunc->nin > 2) {
PyErr_SetString(PyExc_ValueError,
"Only unary and binary ufuncs supported at this time");
Expand Down
19 changes: 18 additions & 1 deletion numpy/core/tests/test_ufunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ def test_signature8(self):
assert_equal(ixs, (0, 0, 0, 1, 2))
assert_equal(flags, (self.can_ignore, self.size_inferred, 0))
assert_equal(sizes, (3, -1, 9))

def test_signature9(self):
enabled, num_dims, ixs, flags, sizes = umt.test_signature(
1, 1, "( 3) -> ( )")
Expand Down Expand Up @@ -2002,6 +2002,23 @@ def test_inplace_fancy_indexing(self):
# Test multiple output ufuncs raise error, gh-5665
assert_raises(ValueError, np.modf.at, np.arange(10), [1])

# Test ufuncs with non-trivial signature raise a TypeError
a = np.ones((2, 2, 2))
b = np.ones((1, 2, 2))
assert_raises(TypeError, np.matmul.at, a, [0], b)

a = np.array([[[1, 2], [3, 4]]])
assert_raises(TypeError, np.linalg._umath_linalg.det.at, a, [0])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These tests look good. But single test functions getting too long tends to be inconvenient. Could you make a new method for these two? Could just be something mentioning that gufuncs don't support at or so...


# Ufunc with None signature should work as intended
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we should have tests for this already? So I think you can remove them again.
If you think they add something, just move them above to that long list for now...

a = np.array([1, 2, 3])
np.add.at(a, [0], 4)
assert_equal(np.array([5, 2, 3]), a)

a = np.array([1, 2, 3])
np.maximum.at(a, [0], 0)
assert_equal(np.array([1, 2, 3]), a)

def test_reduce_arguments(self):
f = np.add.reduce
d = np.ones((5,2), dtype=int)
Expand Down