8000 WIP: Implement oindex by seberg · Pull Request #6075 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

WIP: Implement oindex #6075

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

Closed
wants to merge 21 commits into from
Closed

WIP: Implement oindex #6075

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c74243a
WIP: Implement oindex
seberg Jul 14, 2015
c5117ae
DEP: Deprecate unclear plain advanced indexing cases
seberg Nov 29, 2015
7b3fc79
FIX: Implement exact dimensions matchup requirement as in NEP
seberg Nov 29, 2015
4138d20
WIP: Try implementing __getitem__ subclass stuff
seberg Jan 3, 2016
2d6c9de
TST: Adept tests to new indexing methods
seberg Jan 3, 2016
aa07d61
Some tries, of course there are a lot of hidden errors in indexing
seberg Jan 3, 2016
f4bcb46
TST: Some more fixed tests
seberg Feb 14, 2016
72b8ee8
WIP: Try implementing new special method
seberg Sep 10, 2016
90d1dd7
WIP: Try to get stuff to work with __numpy_getitem__
seberg Sep 11, 2016
6ada047
Tiny fixups, I think I remember the main problem now, to make it quic…
seberg Mar 29, 2017
47d77ad
Tiny fixes, but overall the rebase may have been a failure :(
seberg Jun 21, 2018
3385e2d
BUG: One bug and small test fixups
seberg Jun 21, 2018
528605d
ENH: Use special indexing item to drop through subclasses
seberg Jul 27, 2018
b87ade3
Some futer fixups, is ma/core really changed?
seberg Jul 28, 2018
8f4018a
Some further fixups, remaining errors seem pretty unspectacular
seberg Jul 28, 2018
3c2fbbd
Some more fixups, forbid length explicitely
seberg Jul 28, 2018
f5136f4
ENH: as per NEP, outright disallow non-tuple sequences.
seberg Jul 29, 2018
a8440d4
TST: Fix the last few failing tests
seberg Jul 29, 2018
ccdcaf3
BUG,ENH: Fix some smaller bugs, make sure no field access but mostly...
seberg Jul 29, 2018
a2eea49
BUG: Fix reported fancy_ndim
seberg Jul 29, 2018
cd0241c
BUG: Have to check 0D bool first
seberg Jul 29, 2018
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
BUG: Have to check 0D bool first
  • Loading branch information
@seberg
seberg committed Jul 29, 2018
commit cd0241c714da11e564339fdc2e4f8206e5526b22
10 changes: 5 additions & 5 deletions numpy/core/src/multiarray/mapping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4440,18 +4440,18 @@ multiindex_prepared(PyArrayMultiIndex *self, PyObject *args, PyObject *kwds)
PyTuple_SET_ITEM(new_index, i, indices[i].object);
tuple_index++;
}
else if (indices[i].type & HAS_FANCY) {
Py_INCREF(indices[i].object);
PyTuple_SET_ITEM(new_index, i, indices[i].object);
tuple_index++;
}
else if (indices[i].type & HAS_0D_BOOL) {
/* if this happens should be the only element really */
tmp = indices[i].value ? Py_True : Py_False;
Py_INCREF(tmp);
PyTuple_SET_ITEM(new_index, i, tmp);
tuple_index++;
}
else if (indices[i].type & HAS_FANCY) {
Py_INCREF(indices[i].object);
PyTuple_SET_ITEM(new_index, i, indices[i].object);
tuple_index++;
}
else {
PyErr_SetString(PyExc_RuntimeError,
"internal numpy error, please contact the "
Expand Down
0