-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Enable flox
in GroupBy
and resample
#5734
Closed
andersy005
wants to merge
181
commits into
pydata:main
from
andersy005:groupby-aggs-using-numpy-groupies
Closed
Changes from 1 commit
Commits
Show all changes
181 commits
Select commit
Hold shift + click to select a range
c486df7
Move `_reduce_method` classmethod to `groupby.py` module
andersy005 ef91e6e
Add _numpy_groupies module
andersy005 511dd44
Add more aggregations
andersy005 3ee6200
Remove comments
andersy005 f088392
Fix position keyword arguments
andersy005 35944e4
Remove `_numpy_groupies.py` module
andersy005 9be0228
Merge branch 'pydata:main' into groupby-aggs-using-numpy-groupies
andersy005 e6bcce9
some fixes
dcherian 4702c9d
Merge branch 'groupby-aggs-using-numpy-groupies' of github.com:anders…
dcherian 489b2ff
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 cdf7612
Fix resample test
dcherian af4cc5d
Fix reduce methods
dcherian 58c1c6b
Add _dask_groupby_kwargs
dcherian 69fd563
Avoid forwarding DummyGroup objects
dcherian b1e3ab2
Raise error when reducing along indexed dimensions with squeeze=True
dcherian 462e61b
Don't pass numeric_only to DataArray.reduce
dcherian 1d9a360
Add CI for now
dcherian f4748ee
typo
dcherian b97ffcb
Fix windows env
dcherian 9b44db9
Fix keep_attrs test
dcherian 262a3f5
Update ci/requirements/environment-windows.yml
dcherian e3b3a00
Fix resampling
dcherian 4b25db5
Merge branch 'groupby-aggs-using-numpy-groupies' of github.com:anders…
dcherian 0f2c59f
Merge branch 'main' of github.com:pydata/xarray into groupby-aggs-usi…
andersy005 77f0e0e
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian faee02c
fix env stuff + remove env var
dcherian 3608e9f
get working again
dcherian ad25f78
Add to asv env
dcherian 932b9a5
Separate out median
dcherian ac85e72
make dask_groupby actually optional
dcherian d238459
any,all
dcherian a2168df
typo again
dcherian 6b9a81a
Better generator for reductions.
dcherian 569c67f
Add ddof for var, std
dcherian 816e794
Generate DataArray, Dataset reductions too.
dcherian a04ed82
Small changes
dcherian 7f39cc0
Minor docstring improvements.
dcherian 99bfe12
Fixes #5898
dcherian 08911b9
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian 9bb2c32
Reorder docstring to match numpy
dcherian dea8fd9
REfactor
dcherian f06e6a7
Revert "Separate out median"
dcherian 0661c1b
Refactored generator
dcherian 0c35c0c
Reimplemented
dcherian 3e08964
Add benchmarks
dcherian 583187a
Fix benchmark to not groupby chunked variables.
dcherian 4ef53db
Start supporting ndim groups
dcherian 6afb3bf
WIP refactor init
dcherian 35af40a
Revert "WIP refactor init"
dcherian c9a82b3
Revert "Start supporting ndim groups"
dcherian 0ac5498
Avoid stacking by default
dcherian b9bc1dd
Update reductions
dcherian bece14e
Fix median and add test.
dcherian 41f0aa5
fix test
dcherian 0559ee1
Fix var, std doctests
dcherian 31e1fd2
Force test failure to check CI env
dcherian 47b593c
Use conda-forge numpy_groupies in CI
dcherian c7e9d96
Minor improvement
dcherian 77d2665
Revert "Force test failure to check CI env"
dcherian 11c3d33
Fixed doctests in dask_groupby
dcherian be53f13
See if its an import error
dcherian 35908b5
Revert "See if its an import error"
dcherian 9c2cbb8
Ppass through objects with only numpy or dask arrays
dcherian e9af57c
Try fixing mypy
dcherian 415eb29
Fix bug when binning by nD variable.
dcherian edbd376
Fix binning and weird issues with precision and pd.cut
dcherian c189eea
Fix upsampling with resample
dcherian 43ade8c
"blockwise" need not be the best strategy for resample..
dcherian 553735e
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian 03b7b31
one more bugfix
dcherian e038cc7
Fix dimension order when binning a dimension coordinate
dcherian 1f370f6
silence warning
dcherian 7375dd4
fix test.
dcherian 860f7be
add extra test
dcherian ced9034
Update upstream-dev env
dcherian b269439
[test-upstream] Revert setting npg option in benchmarks
dcherian cc8abfe
[test-upstream] Rename to flox
dcherian 033f5b5
Add to print_versions
dcherian bd24db4
Add to all-but-dask
dcherian 098467d
Force failure to make sure CI is working.
dcherian a282ad4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 8f23310
Revert "Force failure to make sure CI is working."
dcherian 5dcb5bf
Attempt fixing typing errors
Illviljan 411d75d
Now get normal code running as well
Illviljan 6a9a124
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] dd28a57
updates
dcherian f03b675
Merge branch 'main' into pr/5950
Illviljan dfbe103
Merge branch 'generate-reductions-class' of https://github.com/dcheri…
Illviljan 2bbddaf
make reduce args consistent
Illviljan 3d854e5
more reduce edits
Illviljan be33560
one more reduce
Illviljan 0f94bec
another reduce
Illviljan 19d82cd
more reduce
Illviljan cd8a898
add doctests
dcherian 4f378a3
Bugfix DataArray resampling.
dcherian 6916fa7
Update xarray/util/generate_reductions.py
dcherian af03ca4
Small improvement to resampling
dcherian cfd2c07
minimize conflicts
dcherian 3c51b1a
Squash merge #5950
dcherian 2a1b12f
Update xarray/util/generate_reductions.py
dcherian 638d98a
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian 45feeab
Annotate some reduction tests.
dcherian b406789
Merge remote-tracking branch 'upstream/main' into generate-reductions…
dcherian 1875fd2
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 66151f6
Merge branch 'main' into pr/5950
Illviljan 3dc94ae
force keyword args after dim
Illviljan bc55db3
Write to file using open() instead.
Illviljan b78df18
Update _reductions.py
Illviljan 16372a5
Merge branch 'generate-reductions-class' of https://github.com/dcheri…
Illviljan 74064b9
manual tweaks to make ci happy
Illviljan 8336c53
Merge branch 'main' into pr/5950
Illviljan ad6b5bc
Merge branch 'main' into groupby-aggs-using-numpy-groupies
dcherian e1ba8a2
use_numpy_groupies → use_flox
dcherian bdb999f
fix tests
dcherian 4fb17b1
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian 70266e1
fix tests
dcherian 41e43fe
fix tests
dcherian 2c2e7dc
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian c157fca
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian 3f3a197
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 cd51a15
Merge branch 'main' into generate-reductions-class
dcherian 7b34077
Fix path
dcherian 9799d87
Apply suggestions from code review
dcherian 1fcd080
Fixes
dcherian ebe9985
Merge branch 'main' into generate-reductions-class
dcherian d5f627c
update _reductions
dcherian e348c76
Merge branch 'main' into groupby-aggs-using-numpy-groupies
dcherian 434db03
polish
dcherian 62474a8
Merge branch 'generate-reductions-class' into groupby-aggs-using-nump…
dcherian 94bcb32
Merge branch 'main' into groupby-aggs-using-numpy-groupies
dcherian a1769ba
polish
dcherian 26d85d5
loooser test
dcherian 705b3f0
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian e412583
Fix.
dcherian 2694dbe
Test flox kwargs
dcherian 1a91802
Merge branch 'main' into groupby-aggs-using-numpy-groupies
dcherian 87f94ba
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 fd6aa17
fix
dcherian c176f8d
Test cleanup
dcherian 9d4ee11
[skip-ci] Apply suggestions from code review
dcherian 4dd9e66
Update envs
dcherian 812ce33
[skip-ci] Apply suggestions from code review
dcherian 628406c
Merge branch 'groupby-aggs-using-numpy-groupies' of github.com:anders…
dcherian 158314a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 3580ae3
fix
dcherian da31c4f
Merge branch 'groupby-aggs-using-numpy-groupies' of github.com:anders…
dcherian d613779
fix
dcherian d2510c0
Merge branch 'main' into groupby-aggs-using-numpy-groupies
dcherian d0a412a
Update ci/requirements/environment-windows.yml
dcherian 5627277
Merge branch 'main' into groupby-aggs-using-numpy-groupies
dcherian 3a7052e
Support numeric_only
dcherian fcef26f
Merge branch 'groupby-aggs-using-numpy-groupies' of github.com:anders…
dcherian eae37e2
Properly support numeric_only
dcherian 5583e34
Set default to "split-reduce" to reduce surprises
dcherian 5337bd4
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
dcherian 2d1de0f
Add flox to min_all_deps
dcherian 7d9b470
Update ci/requirements/min-all-deps.yml
dcherian 7dab730
[skip-ci] add whats-new
dcherian 6902de3
Better defaults for resample
dcherian b2b3001
[skip-ci] Fix whats-new.
dcherian 36c206e
Clean up resampling.
dcherian 7869ad5
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 7a58590
Test adding back dummy methods.
Illviljan 687beac
Update _reductions.py
Illviljan 4705b6c
Update _reductions.py
Illviljan ac49bfa
Update resample.py
Illviljan 444feee
Try subclassing to ResampleBase-classes
Illviljan 1ac3281
Merge branch 'main' into pr/5734
Illviljan 4f7ef6d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 3282809
Copy/paste instead of a for loop
Illviljan 2ee1de4
Merge branch 'groupby-aggs-using-numpy-groupies' of https://github.co…
Illviljan 4a384fd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] c38ef78
Update resample.py
Illviljan 33f70da
Merge branch 'groupby-aggs-using-numpy-groupies' of https://github.co…
Illviljan d711d58
Merge branch 'main' into pr/5734
Illviljan 67cda8a
Ignore typing when flox is not available
Illviljan fd20ba2
Update whats-new
dcherian ad33d85
Deduplicate
dcherian 3ab03ee
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 2e3dca8
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 6573e4b
Merge branch 'main' into groupby-aggs-using-numpy-groupies
andersy005 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Raise error when reducing along indexed dimensions with squeeze=True
- Loading branch information
commit b1e3ab25e85ad3df302209c22639e6af11b1d443
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Chose to add some extra private attributes instead of fully refactoring the constructor (which is a big change!). We'll have to refactor the constructor to enable grouping by multiple variables, so we could do that in a future PR.