Code

WIP: indexing with broadcasting#1473

Code

Closed

shoyer wants to merge 128 commits intopydata:masterpydata/xarray:masterfrom fujiisoup:indexing_broadcastingfujiisoup/xarray:indexing_broadcastingCopy head branch name to clipboard

+2,063-436

Commits

Commits on Jul 7, 2017

• Implemented _broadcast_indexes in Variable.py

  fujiisoup

  committed
  105bd64

  Copy full SHA for 105bd64

Commits on Jul 10, 2017

• Diagonal indexing for Variable.

  fujiisoup

  committed
  23b4fe0

  Copy full SHA for 23b4fe0

Commits on Jul 12, 2017

• update _broadcast_indexes. update tests.

  fujiisoup

  committed
  726ba5d

  Copy full SHA for 726ba5d

Commits on Jul 16, 2017

• Support basic boolean indexing.

  fujiisoup

  committed
  df7011f

  Copy full SHA for df7011f

• tests for dask-based Variable

  fujiisoup

  committed
  f9232cb

  Copy full SHA for f9232cb

• Explicitly mark xfail flags

  fujiisoup

  committed
  17b6465

  Copy full SHA for 17b6465

• orthogonal indexing for dask.

  fujiisoup

  committed
  33c51d3

  Copy full SHA for 33c51d3

• Refactor DaskArrayAdapter

  shoyer

  committed
  03a336f

  Copy full SHA for 03a336f

Commits on Jul 17, 2017

• Merge pull request #1 from shoyer/indexing_broadcasting

  Show description for d5af395
  fujiisoup

  authored
  d5af395

  Copy full SHA for d5af395

• Added MissingDimensionsError. Improve DaskIndexingAdapter, Variable.__getitem__

  fujiisoup

  committed
  866de91

  Copy full SHA for 866de91

• use np.arange(*slice.indices(size)) rather than np.arange(size)[slice].

  fujiisoup

  committed
  08e7444

  Copy full SHA for 08e7444

• Merge branch 'master' into indexing_broadcasting

  Show description for 84afc98
  fujiisoup

  committed
  84afc98

  Copy full SHA for 84afc98

Commits on Jul 20, 2017

• Add orthogonalize_indexers

  fujiisoup

  committed
  7b33269

  Copy full SHA for 7b33269

• A bug fix.

  fujiisoup

  committed
  50ea56e

  Copy full SHA for 50ea56e

• Working with LazilyIndexedArray

  fujiisoup

  committed
  bac0089

  Copy full SHA for bac0089

• Fix in LazilyIndexedArray.

  fujiisoup

  committed
  1206c28

  Copy full SHA for 1206c28

• add @requires_dask in test_variable

  fujiisoup

  committed
  c2747be

  Copy full SHA for c2747be

Commits on Jul 21, 2017

• rename orthogonalize_indexers -> unbroadcast_indexers

  fujiisoup

  committed
  0671f39

  Copy full SHA for 0671f39

• Wrap LazilyIndexedArray so that it accepts broadcasted-indexers

  fujiisoup

  committed
  ffccff1

  Copy full SHA for ffccff1

• small rename

  fujiisoup

  committed
  becf539

  Copy full SHA for becf539

• Another small fix

  fujiisoup

  committed
  1ae4b4c

  Copy full SHA for 1ae4b4c

• Remove unused function.

  fujiisoup

  committed
  1967bf5

  Copy full SHA for 1967bf5

Commits on Jul 23, 2017

• Added _broadcast_indexes_1vector

  fujiisoup

  committed
  c2eeff3

  Copy full SHA for c2eeff3

• Minor fix

  fujiisoup

  committed
  df12c04

  Copy full SHA for df12c04

• Avoid doubly wrapping by LazilyIndexedArray

  fujiisoup

  committed
  5ba367d

  Copy full SHA for 5ba367d

• General orthogonal indexing for dask array.

  fujiisoup

  committed
  d25c1f1

  Copy full SHA for d25c1f1

Commits on Jul 24, 2017

• Added base class IndexableArrayAdapter

  fujiisoup

  committed
  0115994

  Copy full SHA for 0115994

Commits on Jul 25, 2017

• Deprecate _unbroadcast_indexers and support IndexerTuple classes

  fujiisoup

  committed
  1b4e854

  Copy full SHA for 1b4e854

• removed unintended prints.

  fujiisoup

  committed
  36d052f

  Copy full SHA for 36d052f

• Some clean up.

  fujiisoup

  committed
  9bd53ca

  Copy full SHA for 9bd53ca

• Some small fix.

  fujiisoup

  committed
  563cafa

  Copy full SHA for 563cafa

• Care for boolean array.

  fujiisoup

  committed
  1712060

  Copy full SHA for 1712060

• Always map boolean index to integer array.

  fujiisoup

  committed
  884423a

  Copy full SHA for 884423a

• Takes care of boolean index in test_indexing

  fujiisoup

  committed
  c2e6f42

  Copy full SHA for c2e6f42

• replace self.assertTrue by assert

  fujiisoup

  committed
  002eafa

  Copy full SHA for 002eafa

Commits on Jul 29, 2017

• Fix based on shoyer's comments.

  fujiisoup

  committed
  eedfb3f

  Copy full SHA for eedfb3f

• Added to_tuple() method to IndexerTuple class.

  fujiisoup

  committed
  bb2e515

  Copy full SHA for bb2e515

• Removed: 'orthogonal_indexer', 'canonicalize_indexer'

  fujiisoup

  committed
  5983a67

  Copy full SHA for 5983a67

• update IndexVariable.__getitem__

  fujiisoup

  committed
  7a5ff79

  Copy full SHA for 7a5ff79

Commits on Jul 30, 2017

• Made to_tuple function.

  fujiisoup

  committed
  0b559bc

  Copy full SHA for 0b559bc

• BASIC_INDEXING_TYPES

  fujiisoup

  committed
  bad828e

  Copy full SHA for bad828e

• Removed unused function from tests.

  fujiisoup

  committed
  a821a2b

  Copy full SHA for a821a2b

• assert -> raise

  fujiisoup

  committed
  6550880

  Copy full SHA for 6550880

• Update Dataset.isel

  fujiisoup

  committed
  464e711

  Copy full SHA for 464e711

• Use merge_variables in checking the consistency.

  fujiisoup

  committed
  7dd171d

  Copy full SHA for 7dd171d

• Cleanup Dataset.__getitem__

  shoyer

  committed
  e8f006b

  Copy full SHA for e8f006b

• Add comment about why align() is unneeded

  shoyer

  committed
  a8ec82b

  Copy full SHA for a8ec82b

Commits on Jul 31, 2017

• Ensure correct tests are run in test_variable.py

  shoyer

  committed
  32749d4

  Copy full SHA for 32749d4

• Support pointwise indexing with dask

  shoyer

  committed
  31401d4

  Copy full SHA for 31401d4

Commits on Aug 5, 2017

• Merge pull request #2 from shoyer/indexing_broadcasting

  Show description for f42ddfd
  fujiisoup

  authored
  f42ddfd

  Copy full SHA for f42ddfd

Commits on Aug 6, 2017

• Add a vindex routine for np.ndarray

  shoyer

  committed
  8d96ad3

  Copy full SHA for 8d96ad3

• Add an OrderedSet to xarray.core.utils

  shoyer

  committed
  19f7204

  Copy full SHA for 19f7204

• Support dask and numpy vindex with one path

  shoyer

  committed
  a8f60ba

  Copy full SHA for a8f60ba

• Fix test failures

  shoyer

  committed
  69f8570

  Copy full SHA for 69f8570

• working with Dataset.sel

  fujiisoup

  committed
  5eb00b7

  Copy full SHA for 5eb00b7

• Added more tests

  fujiisoup

  committed
  d133766

  Copy full SHA for d133766

Commits on Aug 7, 2017

• Changes per review

  shoyer

  committed
  631f6e9

  Copy full SHA for 631f6e9

• Merge pull request #3 from shoyer/indexing_broadcasting

  Show description for 72587de
  fujiisoup

  authored
  72587de

  Copy full SHA for 72587de

• Restore isel_points. Remove automatic tuple conversion for sel

  fujiisoup

  committed
  3231445

  Copy full SHA for 3231445

• Some clean up

  fujiisoup

  committed
  dd325c5

  Copy full SHA for dd325c5

Commits on Aug 9, 2017

• Supported indexing by a scalar Variable

  fujiisoup

  committed
  434a004

  Copy full SHA for 434a004

• Supported the indexing by DataArray with coordinates.

  fujiisoup

  committed
  d518f7a

  Copy full SHA for d518f7a

• Update DataArray.loc and DataArray.sel to use Dataset.loc and Dataset.sel

  fujiisoup

  committed
  ba3cc88

  Copy full SHA for ba3cc88

Commits on Aug 21, 2017

• Merge remote-tracking branch 'pydata/master' into indexing_broadcasting

  fujiisoup

  committed
  f63f3d5

  Copy full SHA for f63f3d5

• Added inhouse normalize_axis_index

  fujiisoup

  committed
  aa10635

  Copy full SHA for aa10635

• Support an integer key for _advanced_indexer_subspaces

  fujiisoup

  committed
  fd73e82

  Copy full SHA for fd73e82

Commits on Aug 27, 2017

• Add warning for coordinate conflict.

  fujiisoup

  committed
  6202aff

  Copy full SHA for 6202aff

• Warning changes DeprecationWarning -> FutureWarning.

  fujiisoup

  committed
  f9746fd

  Copy full SHA for f9746fd

• fix related to pytest.warns

  fujiisoup

  committed
  f78c932

  Copy full SHA for f78c932

• Another fix related to warning.

  fujiisoup

  committed
  1c027cd

  Copy full SHA for 1c027cd

• Raise an Error for confusing indexing type

  fujiisoup

  committed
  d11829f

  Copy full SHA for d11829f

• Minor fix

  fujiisoup

  committed
  0777128

  Copy full SHA for 0777128

• Test for indexing by a scalar coordinate.

  fujiisoup

  committed
  f580c99

  Copy full SHA for f580c99

Commits on Aug 29, 2017

• Modified test

  fujiisoup

  committed
  4ebe852

  Copy full SHA for 4ebe852

• Remove too specialized errorning

  fujiisoup

  committed
  20f5cb9

  Copy full SHA for 20f5cb9

• Working with docs

  fujiisoup

  committed
  ab08af8

  Copy full SHA for ab08af8

• Found a bug in as_variable

  fujiisoup

  committed
  92dded6

  Copy full SHA for 92dded6

• Working with docs

  fujiisoup

  committed
  a624424

  Copy full SHA for a624424

• Enable indexing IndexVariable by multi-dimensional Variable.

  fujiisoup

  committed
  a4cd724

  Copy full SHA for a4cd724

Commits on Aug 30, 2017

• Found a bug in indexing np.ndarray

  fujiisoup

  committed
  f66c9b6

  Copy full SHA for f66c9b6

• Added a test for boolean-DataArray indexing.

  fujiisoup

  committed
  24309c4

  Copy full SHA for 24309c4

• Merge branch 'indexing_broadcasting' into indexing_broadcasting_doc

  fujiisoup

  committed
  fd698de

  Copy full SHA for fd698de

• Make sure assignment certainly works.

  fujiisoup

  committed
  9cbaff9

  Copy full SHA for 9cbaff9

Commits on Aug 31, 2017

• Added assignment section

  fujiisoup

  committed
  a5c7766

  Copy full SHA for a5c7766

• pep8

  fujiisoup

  committed
  f242166

  Copy full SHA for f242166

• Remove unused tests.

  fujiisoup

  committed
  bff18f0

  Copy full SHA for bff18f0

• Add more docs.

  fujiisoup

  committed
  21c11c4

  Copy full SHA for 21c11c4

• Api.rst changed

  fujiisoup

  committed
  1975f66

  Copy full SHA for 1975f66

• Merge branch 'indexing_broadcasting_doc' into indexing_broadcasting

  fujiisoup

  committed
  73ad94e

  Copy full SHA for 73ad94e

• Add link in whats-new

  fujiisoup

  committed
  b49f813

  Copy full SHA for b49f813

• Small format cleanup

  fujiisoup

  committed
  1fd6b3a

  Copy full SHA for 1fd6b3a

• allow positional indexing with unsigned integer types

  

  Joe Hamman

  committed
  46dd7c7

  Copy full SHA for 46dd7c7

Commits on Sep 1, 2017

• Merge branch 'master' into indexing_broadcasting

  Show description for 11f3e4f
  fujiisoup

  committed
  11f3e4f

  Copy full SHA for 11f3e4f

• Catch up to the previous merge.

  fujiisoup

  committed
  1d3eddc

  Copy full SHA for 1d3eddc

• Merge remote-tracking branch 'github/fix/1405' into indexing_broadcasting

  Show description for bcb25f1
  fujiisoup

  committed
  bcb25f1

  Copy full SHA for bcb25f1

• workaround for daskarray with uint indexer.

  fujiisoup

  committed
  7104964

  Copy full SHA for 7104964

Commits on Sep 2, 2017

• Add a section about assignment, full indexing rules.

  fujiisoup

  committed
  173968b

  Copy full SHA for 173968b

Commits on Sep 3, 2017

• Merge branch 'master' into indexing_broadcasting

  fujiisoup

  committed
  addb91a

  Copy full SHA for addb91a

Commits on Sep 4, 2017

• warning added for reindex for DataArray indexers.

  fujiisoup

  committed
  7ad7d36

  Copy full SHA for 7ad7d36

• Move warning in alignment.reindex_variables.

  fujiisoup

  committed
  91dd833

  Copy full SHA for 91dd833

Commits on Sep 5, 2017

• + Change API to attach non-dimensional coordinates.

  Show description for 118a5d8
  fujiisoup

  committed
  118a5d8

  Copy full SHA for 118a5d8

• Some clean up. Fix error in test_reindex_warning

  fujiisoup

  committed
  dc9f8a6

  Copy full SHA for dc9f8a6

• Enable vindex for PandasIndexAdapter.

  fujiisoup

  committed
  5726c89

  Copy full SHA for 5726c89

Commits on Sep 6, 2017

• Add deprecation warning for isel_points

  fujiisoup

  committed
  523ecaa

  Copy full SHA for 523ecaa

• Merge branch 'master' into indexing_broadcasting

  fujiisoup

  committed
  a3a83db

  Copy full SHA for a3a83db

• Add a sanity check for boolean vectorized indexing.

  fujiisoup

  committed
  765ae45

  Copy full SHA for 765ae45

• Modify tests to take care of the sanity check related to boolean array indexing.

  fujiisoup

  committed
  3deaf5c

  Copy full SHA for 3deaf5c

• Another follow up

  fujiisoup

  committed
  c8c8a12

  Copy full SHA for c8c8a12

• pep8

  fujiisoup

  committed
  a16a04b

  Copy full SHA for a16a04b

Commits on Sep 7, 2017

• Clean up sanity checks in broadcast_indexers

  fujiisoup

  committed
  1b34cd4

  Copy full SHA for 1b34cd4

Commits on Sep 11, 2017

• Fix unintended rename

  fujiisoup

  committed
  24599a7

  Copy full SHA for 24599a7

• indexing.rst edits

  shoyer

  committed
  d5d967b

  Copy full SHA for d5d967b

Commits on Sep 17, 2017

• remove note about conflicts for now

  shoyer

  committed
  d0d6a6f

  Copy full SHA for d0d6a6f

• Apply coordinate conflict rule.

  fujiisoup

  committed
  4f08e2e

  Copy full SHA for 4f08e2e

Commits on Sep 18, 2017

• Python 2 support

  fujiisoup

  committed
  fbbe35c

  Copy full SHA for fbbe35c

• Add tests for mindex selection.

  fujiisoup

  committed
  db23c93

  Copy full SHA for db23c93

• Drop coordinate of itself.

  fujiisoup

  committed
  031be9a

  Copy full SHA for 031be9a

• Clean up the coordinate dropping logic.

  fujiisoup

  committed
  969f9cf

  Copy full SHA for 969f9cf

Commits on Sep 22, 2017

• Merge pull request #4 from shoyer/indexing_broadcasting

  Show description for 8608451
  fujiisoup

  authored
  8608451

  Copy full SHA for 8608451

• A small bug fix in coordinate dropping logic

  fujiisoup

  committed
  b4e5b36

  Copy full SHA for b4e5b36

Commits on Sep 27, 2017

• Merge remote-tracking branch 'pydata/master' into indexing_broadcasting

  fujiisoup

  committed
  9523039

  Copy full SHA for 9523039

• Fixes based on jhamman's comments.

  fujiisoup

  committed
  dc60348

  Copy full SHA for dc60348

• Improve test for warning.

  fujiisoup

  committed
  8a62ad9

  Copy full SHA for 8a62ad9

Commits on Oct 4, 2017

• Merge branch 'master' into indexing_broadcasting

  fujiisoup

  committed
  6b96960

  Copy full SHA for 6b96960

• Remove unused assert sentence.

  fujiisoup

  committed
  cb84154

  Copy full SHA for cb84154

Commits on Oct 9, 2017

• Simplify rules for indexing conflicts

  shoyer

  committed
  9726531

  Copy full SHA for 9726531

• Merge pull request #5 from shoyer/indexing_broadcasting

  Show description for caa79fe
  fujiisoup

  authored
  caa79fe

  Copy full SHA for caa79fe

Commits on Oct 10, 2017

• Better error-message for multiindex vectorized-selection.

  fujiisoup

  committed
  170abc5

  Copy full SHA for 170abc5