REF: _cython_agg_blocks follow patterns similar to _apply_blockwise #35632
Conversation
This file contains hidden or 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
…f-mgr-transform-3
…f-mgr-transform-3
…f-mgr-transform-3
…f-mgr-transform-3
…f-mgr-transform-3
jreback
requested changes
Aug 10, 2020
pandas/core/groupby/generic.py
Outdated
| @@ -1107,21 +1103,35 @@ def cast_result_block(result, block: "Block", how: str) -> "Block": | |||
| # is a lie. To keep the code-path for the typical non-split case | |||
| # clean, we choose to clean up this mess later on. | |||
| assert len(locs) == result.shape[1] | |||
| new_blocks = [] | |||
There was a problem hiding this comment.
and move this to a higher scope (as used in both parts)
There was a problem hiding this comment.
We only append to it in this scope, everywhere else we set it directly
There was a problem hiding this comment.
this is used in 3 blackes (sure you don't append and instead directly assign in the other scopes), but it is the same name. I would simply define it once, then append for each (or leave the assign for the others is ok i guess); it just is much easier to grok the fact that we are defining the same variable.
pandas/core/groupby/generic.py
Outdated
| @@ -1059,8 +1058,7 @@ def cast_result_block(result, block: "Block", how: str) -> "Block": | |||
| agg_block: Block = block.make_block(result) | |||
| return agg_block | |||
|
|
|||
| for block in data.blocks: | |||
| # Avoid inheriting result from earlier in the loop | |||
| def blk_func(block): | |||
pandas/core/groupby/generic.py
Outdated
| new_blocks = [agg_block] | ||
| return new_blocks | ||
|
|
||
| skipped = [] |
jreback
requested changes
Aug 11, 2020
pandas/core/groupby/generic.py
Outdated
| @@ -1107,21 +1103,35 @@ def cast_result_block(result, block: "Block", how: str) -> "Block": | |||
| # is a lie. To keep the code-path for the typical non-split case | |||
| # clean, we choose to clean up this mess later on. | |||
| assert len(locs) == result.shape[1] | |||
| new_blocks = [] | |||
pandas/core/groupby/generic.py
Outdated
| @@ -1107,21 +1103,35 @@ def cast_result_block(result, block: "Block", how: str) -> "Block": | |||
| # is a lie. To keep the code-path for the typical non-split case | |||
| # clean, we choose to clean up this mess later on. | |||
| assert len(locs) == result.shape[1] | |||
| new_blocks = [] | |||
There was a problem hiding this comment.
and move this to a higher scope (as used in both parts)
jreback
approved these changes
Aug 12, 2020
|
thanks |
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.
Follows #35535
This isn't yet identical to apply_blockwise, because both this and apply_blockwise have some odd behaviors that need to get standardized before they get combined into a BlockManager method, but this is a move in that direction.