10000 ENH: create and use indexed inner loops by mattip · Pull Request #23136 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH: create and use indexed inner loops #23136

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 20 commits into from
Feb 7, 2023
Merged

ENH: create and use indexed inner loops #23136

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
90243f5
ENH: add indexed loops
mattip Jan 18, 2023
3ba259d
refactor ufunc_at to first get the inner loop, then create the iterators
mattip Jan 22, 2023
7910e2b
ENH: add indexed lower loops and connect them to ufuncs
mattip Jan 23, 2023
eb21b25
ENH: use an indexed loop if possible in ufunc_at
mattip Jan 30, 2023
888bba2
MAINT: fix linting
mattip Jan 31, 2023
be64173
ENH: update and sync the public API
mattip Jan 31, 2023
8bfaaf3
BENCH: fix benchmark
mattip Jan 31, 2023
28706af
MAINT, BUG: fixes from review and testing
mattip Feb 1, 2023
1db1ffe
MAINT: linting
mattip Feb 1, 2023
ec1a434
MAINT: update EXPERIMENTAL_DTYPE_API_VERSION too
mattip Feb 1, 2023
6541cf5
DOC: add a performance release note
mattip Feb 1, 2023
3802b16
MAINT: rework release note, changes from review
mattip Feb 5, 2023
f064552
BUG: Clean up reference handling in `ufunc.at` a little.
seberg Feb 6, 2023
6cf9cc9
BUG: Deal with casting and non-contig/1-D indices
seberg Feb 6, 2023
ff97723
BUG: fixes from review: use iter->nd and adapt to unary ufuncs
mattip Feb 6, 2023
163d3c5
BUG: improve check for 1d operands (from review)
mattip Feb 7, 2023
f79325e
TST: add test (from review)
mattip Feb 7, 2023
b80bc2d
ENH: fixes from review
mattip Feb 7, 2023
26978d7
DOC: improve release snippet (from review)
mattip Feb 7, 2023
790426e
TST, BUG: add a test for unary ufuncs, fix condition for indexed loops
mattip Feb 7, 2023
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: fixes from review: use iter->nd and adapt to unary ufuncs
  • Loading branch information
@mattip
mattip committed Feb 6, 2023
commit ff97723de0ff365f5d7f2b30be5ac7987511a584
17 changes: 11 additions & 6 deletions numpy/core/src/umath/ufunc_object.c
View file
Open in desktop
BA08
Original file line number Diff line number Diff line change
Expand Up @@ -5039,7 +5039,7 @@ ufunc_geterr(PyObject *NPY_UNUSED(dummy), PyObject *NPY_UNUSED(arg))
{
PyObject *thedict;
PyObject *res;

thedict = PyThreadState_GetDict();
if (thedict == NULL) {
thedict = PyEval_GetBuiltins();
Expand Down Expand Up @@ -5909,9 +5909,14 @@ trivial_at_loop(PyArrayMethodObject *ufuncimpl, NPY_ARRAYMETHOD_FLAGS flags,
char *args[3];
npy_intp steps[3];
args[0] = (char *) iter->baseoffset;
args[2] = (char *)PyArray_DATA(op2_array);
steps[0] = iter->fancy_strides[0];
steps[2] = PyArray_STRIDE(op2_array, 0);
if (ufuncimpl->nin == 1) {
args[2] = NULL;
steps[2] = 0;
} else {
args[2] = (char *)PyArray_DATA(op2_array);
steps[2] = PyArray_STRIDE(op2_array, 0);
}

npy_intp *inner_size = NpyIter_GetInnerLoopSizePtr(iter->outer);

Expand All @@ -5932,7 +5937,7 @@ trivial_at_loop(PyArrayMethodObject *ufuncimpl, NPY_ARRAYMETHOD_FLAGS flags,
}

if (res == 0 && !(flags & NPY_METH_NO_FLOATINGPOINT_ERRORS)) {
const char * ufunc_name =
const char * ufunc_name =
ufunc_get_name_cstr((PyUFuncObject *)context->caller);
if (_get_bufsize_errmask(NULL, ufunc_name,
&buffersize, &errormask) < 0) {
Expand Down Expand Up @@ -6435,8 +6440,8 @@ ufunc_at(PyUFuncObject *ufunc, PyObject *args)
*/
if ((ufuncimpl->contiguous_indexed_loop != NULL) &&
(PyArray_NDIM(op1_array) == 1) &&
(ufuncimpl->nin == 1 || PyArray_NDIM(op2_array) == 1) &&
(iter->numiter == 1)) {
(op2_array != NULL && PyArray_NDIM(op2_array) == 1) &&
(iter->nd == 1)) {
res = trivial_at_loop(ufuncimpl, flags, iter, op1_array,
op2_array, &context);

Expand Down
0