refactor GroupBy internals #9389
Merged
Conversation
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
1. Simplify ResolvedGrouper by moving logic to EncodedGroups 2. Stack outside ResolvedGrouper in GroupBy.__init__ to prepare for multi-variable GroupBy
dcherian
force-pushed
the
groupby-refactoring-2
branch
from
5b40ae3
to
b264dc1
Compare
dcherian
commented
Aug 21, 2024
| # assign coord when the applied function does not return that coord | ||
| if coord is not None and dim not in applied_example.dims: |
There was a problem hiding this comment.
nice simplification!
dcherian
commented
Aug 21, 2024
| unique_coord: Variable | _DummyGroup | None = None, | ||
| coords: Coordinates | None = None, | ||
| ): | ||
| from xarray.core.groupby import _codes_to_group_indices |
There was a problem hiding this comment.
logic moved from resolvedgrouper
dcherian
commented
Aug 21, 2024
| Coordinates( | ||
| coords={name: (name, np.array(output_index))}, | ||
| indexes={name: PandasIndex(output_index, dim=name)}, | ||
| group_dims = set(grouper.group.dims) |
There was a problem hiding this comment.
This is the only main logic change. It is needed to get the new tests to pass
max-sixty
approved these changes
Aug 21, 2024
|
Thanks! That's good enough. It mostly undoes a previous refactor, haha. |
dcherian
added a commit
to TomNicholas/xarray
that referenced
this pull request
Aug 22, 2024
* main: (214 commits) Adds copy parameter to __array__ for numpy 2.0 (pydata#9393) `numpy 2` compatibility in the `pydap` backend (pydata#9391) pyarrow dependency added to doc environment (pydata#9394) Extend padding functionalities (pydata#9353) refactor GroupBy internals (pydata#9389) Combine `UnsignedIntegerCoder` and `CFMaskCoder` (pydata#9274) passing missing parameters to ZarrStore.open_store when opening a datatree (pydata#9377) Fix tests on big-endian systems (pydata#9380) Improve error message on `ds['x', 'y']` (pydata#9375) Improve error message for missing coordinate index (pydata#9370) Add flaky to TestNetCDF4ViaDaskData (pydata#9373) Make chunk manager an option in `set_options` (pydata#9362) Revise (pydata#9371) Remove duplicate word from docs (pydata#9367) Adding open_groups to BackendEntryPointEngine, NetCDF4BackendEntrypoint, and H5netcdfBackendEntrypoint (pydata#9243) Revise (pydata#9366) Fix rechunking to a frequency with empty bins. (pydata#9364) whats-new entry for dropping python 3.9 (pydata#9359) drop support for `python=3.9` (pydata#8937) Revise (pydata#9357) ...
dcherian
added a commit
to dcherian/xarray
that referenced
this pull request
Aug 30, 2024
* main: Adds copy parameter to __array__ for numpy 2.0 (pydata#9393) `numpy 2` compatibility in the `pydap` backend (pydata#9391) pyarrow dependency added to doc environment (pydata#9394) Extend padding functionalities (pydata#9353) refactor GroupBy internals (pydata#9389) Combine `UnsignedIntegerCoder` and `CFMaskCoder` (pydata#9274) passing missing parameters to ZarrStore.open_store when opening a datatree (pydata#9377) Fix tests on big-endian systems (pydata#9380) Improve error message on `ds['x', 'y']` (pydata#9375)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
multi-variable GroupBy
Broken out form #9372