8000 MAINT: Make the refactor suggested in prepare_index by eric-wieser · Pull Request #8278 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

MAINT: Make the refactor suggested in prepare_index #8278

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 11 commits into from
Jul 18, 2017
Merged

MAINT: Make the refactor suggested in prepare_index #8278

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
87e1294
MAINT: Make the refactor suggested in prepare_index
eric-wieser Nov 14, 2016
bfd70c2
MAINT: Fix typo, remove unnecessary nesting
eric-wieser Dec 5, 2016
37e6e1f
MAINT: use PyTuple_Pack, which is probably faster than Py_BuildValue
eric-wieser Dec 21, 2016
3a0ad85
MAINT: Overhaul function to try and increase speed
eric-wieser Apr 7, 2017
8c4e556
BUG: Fix reference counting
eric-wieser Apr 9, 2017
5d9315c
STY: Fix comment capitalization and format
eric-wieser Apr 9, 2017
966b2c7
fixup! BUG: Fix reference counting
eric-wieser Apr 9, 2017
9832f05
fixup! MAINT: Overhaul function to try and increase speed
eric-wieser Apr 9, 2017
68bad6a
MAINT: Improve comments, simplify handling of tuple subclasses
eric-wieser Jul 16, 2017
c587963
fixup! MAINT: Improve comments, simplify handling of tuple subclasses
eric-wieser Jul 16, 2017
105e0b4
fixup! MAINT: Improve comments, simplify handling of tuple subclasses
eric-wieser Jul 16, 2017
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
fixup! BUG: Fix reference counting
  • Loading branch information
@eric-wieser
eric-wieser committed Apr 9, 2017
commit 966b2c7e00d797d23740034cda691ee433743fef
6 changes: 2 additions & 4 deletions numpy/core/src/multiarray/mapping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ unpack_indices(PyObject *index, PyObject *result[2*NPY_MAXDIMS])
multi_DECREF(result, i);
return -1;
}
Py_INCREF(result[i]);
}
return n;
}
Expand Down Expand Up @@ -283,7 +282,6 @@ unpack_indices(PyObject *index, PyObject *result[2*NPY_MAXDIMS])
* unpacking
*/
if (tmp_obj == NULL) {
multi_DECREF(result, i);
PyErr_Clear();
break;
}
Expand All @@ -305,8 +303,8 @@ unpack_indices(PyObject *index, PyObject *result[2*NPY_MAXDIMS])
}
/* got to the end, never found an indication that we should have unpacked */
else {
/* we already filled result, so empty it first */
multi_DECREF(result, n);
/* we partially filled result, so empty it first */
multi_DECREF(result, i);

Py_INCREF(index);
result[0] = index;
Expand Down
0