[Data] Deprecate Dataset.get_internal_block_refs()
#46455
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
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>
scottjlee
requested review from
ericl,
scv119,
c21,
amogkam,
bveeramani,
raulchen,
stephanie-wang and
omatthew98
as code owners
scottjlee
commented
Jul 10, 2024
| @@ -59,7 +59,7 @@ def __setattr__(self, key, value): | |||
| object.__setattr__(self, key, value) | |||
|
|
|||
| @property | |||
| def block_refs(self) -> List[BlockMetadata]: | |||
There was a problem hiding this comment.
fix incorrect typehint
omatthew98
approved these changes
Jul 11, 2024
| def _ref_bundles_iterator_to_block_refs_list( | ||
| ref_bundles: Iterator[RefBundle], | ||
| ) -> List[ObjectRef[Block]]: | ||
| """Convert an iterator of RefBundles to a list of object references to Blocks.""" |
There was a problem hiding this comment.
Nit: Change to "Convert an iterator of RefBundles to a list of Block object references." to avoid the double to, for a sec thought this was a double transformation.
bveeramani
approved these changes
Jul 11, 2024
python/ray/data/tests/test_zip.py
Outdated
| @@ -69,7 +69,8 @@ def test_zip_different_num_blocks_split_smallest( | |||
| override_num_blocks=num_blocks2, | |||
| ) | |||
| ds = ds1.zip(ds2).materialize() | |||
| num_blocks = len(ds.get_internal_block_refs()) | |||
| bundles = ds.iter_internal_ref_bundles() | |||
| num_blocks = sum([len(b.block_refs) for b in bundles]) | |||
There was a problem hiding this comment.
Suggested change
| num_blocks = sum([len(b.block_refs) for b in bundles]) | |
| num_blocks = sum(len(b.block_refs) for b in bundles) |
| assert nblocks == 1, nblocks | ||
| ctx.target_max_block_size = 2_000_000 | ||
| nblocks = len(ds2.map_batches(lambda x: x, batch_size=16).get_internal_block_refs()) | ||
| bundles = ds2.map_batches(lambda x: x, batch_size=16).iter_internal_ref_bundles() | ||
| nblocks = sum([len(b.block_refs) for b in bundles]) |
There was a problem hiding this comment.
Nit: Here and elsewhere
Suggested change
| nblocks = sum([len(b.block_refs) for b in bundles]) | |
| nblocks = sum(len(b.block_refs) for b in bundles) |
9 tasks
Signed-off-by: Scott Lee <sjl@anyscale.com>
bveeramani
pushed a commit
that referenced
this pull request
Jul 16, 2024
…dles` instead of `(Block, BlockMetadata)` (#46575) Followup to #46369 and #46455. Update `ExecutionPlan.execute_to_iterator()` to return `RefBundles` instead of `(Block, BlockMetadata)`, to unify the logic between `RefBundle`s and `Block`s. Also refactor the `iter_batches()` code path accordingly to handle `RefBundle`s instead of raw `Block` and `BlockMetadata`. Signed-off-by: sjl <sjl@anyscale.com> 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: #46369 (merged)Replaces
Dataset.get_internal_block_refs()usages withDataset.iter_internal_ref_bundles(), and marks the method as deprecated.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.