[Data] Update ExecutionPlan.execute_to_iterator() to return RefBundles instead of (Block, BlockMetadata)
#46575
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
Signed-off-by: sjl <sjl@anyscale.com>
Signed-off-by: sjl <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
…01-count Signed-off-by: sjl <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
added 3 commits
July 11, 2024 15:42
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
scottjlee
commented
Jul 11, 2024
| @@ -21,7 +21,7 @@ py_library( | |||
| py_test_module_list( | |||
| files = glob(["tests/block_batching/test_*.py"]), | |||
| size = "medium", | |||
| tags = ["team:ml", "exclusive"], | |||
| tags = ["team:data", "exclusive"], | |||
There was a problem hiding this comment.
found that the tests were not being run under data tests, so updated the tag here.
scottjlee
commented
Jul 12, 2024
python/ray/data/_internal/plan.py
Outdated
| elif self.is_read_only(): | ||
| # For consistency with the previous implementation, we fetch the schema if | ||
| # the plan is read-only even if `fetch_if_missing` is False. | ||
| blocks_with_metadata, _, _ = self.execute_to_iterator() | ||
| # blocks_with_metadata, _, _ = self.execute_to_iterator() |
There was a problem hiding this comment.
@scottjlee to remove before merging
added 4 commits
July 12, 2024 01:17
Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: Scott Lee <sjl@anyscale.com>
scottjlee
requested review from
ericl,
scv119,
c21,
amogkam,
bveeramani,
raulchen,
stephanie-wang and
omatthew98
as code owners
raulchen
approved these changes
Jul 15, 2024
Comment on lines
276
to
278
| for block_ref_and_md in next_ref_bundle.blocks: | ||
| sliding_window.append(block_ref_and_md) | ||
| current_window_size += block_ref_and_md[1].num_rows |
There was a problem hiding this comment.
Suggested change
| for block_ref_and_md in next_ref_bundle.blocks: | |
| sliding_window.append(block_ref_and_md) | |
| current_window_size += block_ref_and_md[1].num_rows | |
| sliding_window.extend(next_ref_bundle.blocks): | |
| current_window_size += next_ref_bundle.num_rows() |
added 2 commits
July 15, 2024 11:47
Signed-off-by: Scott Lee <sjl@anyscale.com>
bveeramani
approved these changes
Jul 15, 2024
Comment on lines
139
to
146
| def _bundle_to_block_md_iterator( | ||
| ref_bundles: Iterator[RefBundle], | ||
| ) -> Iterator[Tuple[ObjectRef[Block], BlockMetadata]]: | ||
| """Convert an iterator of RefBundles to an iterator of | ||
| `(Block object reference, corresponding BlockMetadata)`.""" | ||
| for ref_bundle in ref_bundles: | ||
| for block_ref, metadata in ref_bundle.blocks: | ||
| yield block_ref, metadata |
There was a problem hiding this comment.
This isn't called anywhere. Let's remove it?
Signed-off-by: Scott Lee <sjl@anyscale.com>
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.
Why are these changes needed?
Stacked on:
Dataset.get_internal_block_refs()#46455Followup to #46369 and #46455.
Update
ExecutionPlan.execute_to_iterator()to returnRefBundlesinstead of(Block, BlockMetadata), to unify the logic betweenRefBundles andBlocks. Also refactor theiter_batches()code path accordingly to handleRefBundles instead of rawBlockandBlockMetadata.Related issue number
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.