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

indexing with broadcasting #1639

Merged
merged 128 commits into from
Oct 19, 2017
Merged

indexing with broadcasting #1639

merged 128 commits into from
Oct 19, 2017

Conversation

fujiisoup
Copy link
Member

This is a duplicate of #1473 originally opened by @shoyer

Thanks, @shoyer, for giving me github's credit.

I enjoyed this PR.
I really appreciate your help to finish up this PR.

fujiisoup and others added 30 commits July 8, 2017 00:01
@fujiisoup
Implemented _broadcast_indexes in Variable.py
105bd64
@fujiisoup
Diagonal indexing for Variable.
23b4fe0
@fujiisoup
update _broadcast_indexes. update tests.
726ba5d
@fujiisoup
Support basic boolean indexing.
df7011f
@fujiisoup
tests for dask-based Variable
f9232cb
@fujiisoup
Explicitly mark xfail flags
17b6465
@fujiisoup
orthogonal indexing for dask.
33c51d3
@shoyer
Refactor DaskArrayAdapter
03a336f
@fujiisoup
Merge pull request #1 from shoyer/indexing_broadcasting
d5af395 
Refactor DaskArrayAdapter
@fujiisoup
Added MissingDimensionsError. Improve DaskIndexingAdapter, Variable._…
866de91 
…_getitem__
@fujiisoup
use np.arange(*slice.indices(size)) rather than `np.arange(size)[sl…
08e7444 
…ice]`.
@fujiisoup
Merge branch 'master' into indexing_broadcasting
84afc98 
# Conflicts:
#	xarray/core/variable.py
@fujiisoup
Add orthogonalize_indexers
7b33269
@fujiisoup
A bug fix.
50ea56e
@fujiisoup
Working with LazilyIndexedArray
bac0089
@fujiisoup
Fix in LazilyIndexedArray.
1206c28
@fujiisoup
add @requires_dask in test_variable
c2747be
@fujiisoup
rename orthogonalize_indexers -> unbroadcast_indexers
0671f39
@fujiisoup
Wrap LazilyIndexedArray so that it accepts broadcasted-indexers
ffccff1
@fujiisoup
small rename
becf539
@fujiisoup
Another small fix
1ae4b4c
@fujiisoup
Remove unused function.
1967bf5
@fujiisoup
Added _broadcast_indexes_1vector
c2eeff3
@fujiisoup
Minor fix
df12c04
@fujiisoup
Avoid doubly wrapping by LazilyIndexedArray
5ba367d
@fujiisoup
General orthogonal indexing for dask array.
d25c1f1
@fujiisoup
Added base class IndexableArrayAdapter
0115994
@fujiisoup
Deprecate _unbroadcast_indexers and support IndexerTuple classes
1b4e854
@fujiisoup
removed unintended prints.
36d052f
@fujiisoup
Some clean up.
9bd53ca
fujiisoup and others added 22 commits September 6, 2017 23:37
@fujiisoup
Modify tests to take care of the sanity check related to boolean arra…
3deaf5c 
…y indexing.
@fujiisoup
Another follow up
c8c8a12
@fujiisoup
pep8
a16a04b
@fujiisoup
Clean up sanity checks in broadcast_indexers
1b34cd4
@fujiisoup
Fix unintended rename
24599a7
@shoyer
indexing.rst edits
d5d967b
@shoyer
remove note about conflicts for now
d0d6a6f
@fujiisoup
Apply coordinate conflict rule.
4f08e2e
@fujiisoup
Python 2 support
fbbe35c
@fujiisoup
Add tests for mindex selection.
db23c93
@fujiisoup
Drop coordinate of itself.
031be9a
@fujiisoup
Clean up the coordinate dropping logic.
969f9cf
@fujiisoup
Merge pull request #4 from shoyer/indexing_broadcasting
8608451 
indexing.rst edits
@fujiisoup
A small bug fix in coordinate dropping logic
b4e5b36
@fujiisoup
Merge remote-tracking branch 'pydata/master' into indexing_broadcasting
9523039
@fujiisoup
Fixes based on jhamman's comments.
dc60348
@fujiisoup
Improve test for warning.
8a62ad9
@fujiisoup
Merge branch 'master' into indexing_broadcasting
6b96960
@fujiisoup
Remove unused assert sentence.
cb84154
@shoyer
Simplify rules for indexing conflicts
9726531
@fujiisoup
Merge pull request #5 from shoyer/indexing_broadcasting
caa79fe 
Simplify rules for indexing conflicts
@fujiisoup
Better error-message for multiindex vectorized-selection.
170abc5
@jhamman
Copy link
Member

jhamman commented Oct 19, 2017

Nice work. @shoyer - I'll let you do the merge.

@shoyer shoyer merged commit 9a0c744 into pydata:master Oct 19, 2017
@shoyer
Copy link
Member

shoyer commented Oct 19, 2017

In it goes!

@shoyer shoyer mentioned this pull request Oct 19, 2017
Closed
@fujiisoup fujiisoup mentioned this pull request Oct 21, 2017
Closed
@fujiisoup fujiisoup mentioned this pull request Oct 30, 2017
Closed
@fujiisoup fujiisoup deleted the indexing_broadcasting branch November 4, 2017 08:29
@shoyer shoyer mentioned this pull request Sep 4, 2019
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fujiisoup @jhamman @shoyer