[Data] support batch_format for Sort and Aggregate#48287
Merged
scottjlee merged 8 commits intoray-project:masterfrom Nov 13, 2024
Merged
[Data] support batch_format for Sort and Aggregate#48287scottjlee merged 8 commits intoray-project:masterfrom
scottjlee merged 8 commits intoray-project:masterfrom
Conversation
a2b2bc3 to
0045e27
Compare
Contributor
Author
|
Hi @scottjlee, could you take a look when you have time? Thanks a lot! |
scottjlee
reviewed
Oct 28, 2024
Contributor
scottjlee
left a comment
There was a problem hiding this comment.
Great start, have a suggestion on how we can set the batch_format without having it explicitly set at Dataset level.
scottjlee
reviewed
Oct 28, 2024
scottjlee
reviewed
Nov 2, 2024
python/ray/data/_internal/logical/rules/inherit_batch_format.py
Outdated
Show resolved
Hide resolved
python/ray/data/_internal/logical/rules/inherit_batch_format.py
Outdated
Show resolved
Hide resolved
6fc8b80 to
bc0caf0
Compare
bc0caf0 to
e3f14e7
Compare
scottjlee
reviewed
Nov 7, 2024
python/ray/data/_internal/logical/rules/inherit_batch_format.py
Outdated
Show resolved
Hide resolved
81097ac to
f39498b
Compare
Signed-off-by: Xingyu Long <xingyulong97@gmail.com>
Signed-off-by: Xingyu Long <xingyulong97@gmail.com>
Signed-off-by: Xingyu Long <xingyulong97@gmail.com>
Signed-off-by: Xingyu Long <xingyulong97@gmail.com>
Signed-off-by: Xingyu Long <xingyulong97@gmail.com>
f39498b to
e4f5009
Compare
scottjlee
approved these changes
Nov 8, 2024
Contributor
scottjlee
left a comment
There was a problem hiding this comment.
Thanks for your contribution @xingyu-long !
python/ray/data/_internal/logical/rules/inherit_batch_format.py
Outdated
Show resolved
Hide resolved
python/ray/data/_internal/logical/rules/inherit_batch_format.py
Outdated
Show resolved
Hide resolved
Signed-off-by: Xingyu Long <xingyulong97@gmail.com>
20a24af to
afeb03c
Compare
scottjlee
approved these changes
Nov 12, 2024
Comment on lines
+22
to
+25
| for node in op.post_order_iter(): | ||
| nodes.appendleft(node) | ||
|
|
||
| while len(nodes) > 0: |
Contributor
There was a problem hiding this comment.
Let's combine these 2 loops
Contributor
Author
There was a problem hiding this comment.
Looking through the codebase, I was trying to use same coding style for this matter. it seems not worth it to combine? Thanks!
Contributor
There was a problem hiding this comment.
We can't just blindly follow the patterns, these need to make sense, right?
What's the motivation for first collecting the nodes into a queue, instead of traversing the iterator directly?
Signed-off-by: Xingyu Long <xingyulong97@gmail.com>
scottjlee
approved these changes
Nov 13, 2024
JP-sDEV
pushed a commit
to JP-sDEV/ray
that referenced
this pull request
Nov 14, 2024
## Why are these changes needed? While we calling `xxx.map_groups(..., batch_format="...")`, we may invoke sort function and creating empty blocks which still uses pyarrow by default. And, when we invoke another sort call on top of it, we will hit `AttributeError: 'DataFrame' object has no attribute 'num_rows'` since we uses first block type. (However, we may have different blocks). See more details in ray-project#46748 ## Related issue number Close ray-project#46748 ## Checks - [x] I've signed off every commit(by using the -s flag, i.e., `git commit -s`) in this PR. - [x] I've run `scripts/format.sh` to lint the changes in this PR. - [ ] I've included any doc changes needed for https://docs.ray.io/en/master/. - [ ] I've added any new APIs to the API Reference. For example, if I added a method in Tune, I've added it in `doc/source/tune/api/` under the corresponding `.rst` file. - [x] I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/ - Testing Strategy - [x] Unit tests - [ ] Release tests - [ ] This PR is not tested :( --------- Signed-off-by: Xingyu Long <xingyulong97@gmail.com> Co-authored-by: Scott Lee <scottjlee@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Why are these changes needed?
While we calling
xxx.map_groups(..., batch_format="..."), we may invoke sort function and creating empty blocks which still uses pyarrow by default. And, when we invoke another sort call on top of it, we will hitAttributeError: 'DataFrame' object has no attribute 'num_rows'since we uses first block type. (However, we may have different blocks). See more details in #46748Related issue number
Close #46748
Checks
git commit -s) in this PR.scripts/format.shto lint the changes in this PR.method in Tune, I've added it in
doc/source/tune/api/under thecorresponding
.rstfile.