Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Data] Add count logical operator #48126

Merged
merged 8 commits into from
Oct 21, 2024
Merged

[Data] Add count logical operator #48126

merged 8 commits into from
Oct 21, 2024

Conversation

bveeramani
Copy link
Member

Why are these changes needed?

It's difficult to apply counting-related optimizations because the optimizer doesn't know whether a DAG will be counted or regularly iterated over. To make it feasible to apply counting-related logical optimizations, this PR adds the Count logical operator.

Related issue number

Checks

  • I've signed off every commit(by using the -s flag, i.e., git commit -s) in this PR.
  • 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.
  • 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
    • Unit tests
    • Release tests
    • This PR is not tested :(

@bveeramani
Initial commit
4610260 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
@bveeramani bveeramani mentioned this pull request Oct 21, 2024
Closed
8 tasks
@bveeramani
Fix typo
27984dc 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
@bveeramani
Fix typo
6411fea 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
@bveeramani
Fix bug
c72d804 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
@bveeramani
Fix bug
b416a88 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
@bveeramani
Minor optimization
6ab6a20 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
@bveeramani bveeramani enabled auto-merge (squash) October 21, 2024 19:28
@github-actions github-actions bot added the go add ONLY when ready to merge, run all tests label Oct 21, 2024
@bveeramani
Merge branch 'master' into count-operator2
47b61e3 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
@bveeramani bveeramani enabled auto-merge (squash) October 21, 2024 21:13
@bveeramani
Fix tests
7ef85bd 
Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
bveeramani
bveeramani commented Oct 21, 2024
View reviewed changes
python/ray/data/tests/test_numpy.py
Comment on lines -133 to +135
assert str(ds) == (
"Dataset(num_rows=?, schema={data: numpy.ndarray(shape=(1,), dtype=int64)})"
assert ds.count() == 10
assert ds.schema() == Schema(
pa.schema([("data", ArrowTensorType((1,), pa.int64()))])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor some tests that were missed by #48124

@bveeramani bveeramani merged commit 26bdd94 into master Oct 21, 2024
4 of 5 checks passed
@bveeramani bveeramani deleted the count-operator2 branch October 21, 2024 22:28
can-anyscale
can-anyscale reviewed Oct 24, 2024
View reviewed changes
python/ray/data/dataset.py
return total_rows
plan = self._plan.copy()
count_op = Count([self._logical_plan.dag])
logical_plan = LogicalPlan(count_op)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

broke some release tests https://console.anyscale-staging.com/v2/cld_kvedZWag2qA8i5BjxUevf5i7/prj_rw3kzbqsehh4a6klka7j616fgb/jobs/prodjob_n7353559h9m4tqaqjvhyrcdfda?job-logs-section-tabs=application_logs&job-tab=overview

@scottjlee scottjlee mentioned this pull request Oct 25, 2024
Merged
8 tasks
scottjlee added a commit that referenced this pull request Oct 25, 2024
@scottjlee
[Data] Cast Dataset.count() explicitly to int (#48273)
655b64c 
## Why are these changes needed?

#48126 introduced a
`LogicalOperator` for calculating `Dataset.count()`. As an unintended
side effect, calculating `sum()` over numpy batches can result in
returning `np.int64` instead of a regular `int`. This PR explicitly
cases the result to an `int` before returning.

## Related issue number

Closes #48177,
#48176

## 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
   - [x] Release tests
   - [ ] This PR is not tested :(

Signed-off-by: Scott Lee <sjl@anyscale.com>
Jay-ju pushed a commit to Jay-ju/ray that referenced this pull request Nov 5, 2024
@bveeramani @Jay-ju
[Data] Add count logical operator (ray-project#48126)
b2ca826 
It's difficult to apply counting-related optimizations because the optimizer doesn't know whether a DAG will be counted or regularly iterated over. To make it feasible to apply counting-related logical optimizations, this PR adds the Count logical operator.

---------

Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
Jay-ju pushed a commit to Jay-ju/ray that referenced this pull request Nov 5, 2024
@scottjlee @Jay-ju
[Data] Cast Dataset.count() explicitly to int (ray-project#48273)
9864a2d 
## Why are these changes needed?

ray-project#48126 introduced a
`LogicalOperator` for calculating `Dataset.count()`. As an unintended
side effect, calculating `sum()` over numpy batches can result in
returning `np.int64` instead of a regular `int`. This PR explicitly
cases the result to an `int` before returning.

## Related issue number

Closes ray-project#48177,
ray-project#48176

## 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
   - [x] Release tests
   - [ ] This PR is not tested :(

Signed-off-by: Scott Lee <sjl@anyscale.com>
JP-sDEV pushed a commit to JP-sDEV/ray that referenced this pull request Nov 14, 2024
@bveeramani @JP-sDEV
[Data] Add count logical operator (ray-project#48126)
521bdc5 
It's difficult to apply counting-related optimizations because the optimizer doesn't know whether a DAG will be counted or regularly iterated over. To make it feasible to apply counting-related logical optimizations, this PR adds the Count logical operator.

---------

Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
JP-sDEV pushed a commit to JP-sDEV/ray that referenced this pull request Nov 14, 2024
@scottjlee @JP-sDEV
[Data] Cast Dataset.count() explicitly to int (ray-project#48273)
3993a79 
## Why are these changes needed?

ray-project#48126 introduced a
`LogicalOperator` for calculating `Dataset.count()`. As an unintended
side effect, calculating `sum()` over numpy batches can result in
returning `np.int64` instead of a regular `int`. This PR explicitly
cases the result to an `int` before returning.

## Related issue number

Closes ray-project#48177,
ray-project#48176

## 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
   - [x] Release tests
   - [ ] This PR is not tested :(

Signed-off-by: Scott Lee <sjl@anyscale.com>
mohitjain2504 pushed a commit to mohitjain2504/ray that referenced this pull request Nov 15, 2024
@bveeramani @mohitjain2504
[Data] Add count logical operator (ray-project#48126)
caa876a 
It's difficult to apply counting-related optimizations because the optimizer doesn't know whether a DAG will be counted or regularly iterated over. To make it feasible to apply counting-related logical optimizations, this PR adds the Count logical operator.

---------

Signed-off-by: Balaji Veeramani <bveeramani@berkeley.edu>
Signed-off-by: mohitjain2504 <mohit.jain@dream11.com>
mohitjain2504 pushed a commit to mohitjain2504/ray that referenced this pull request Nov 15, 2024
@scottjlee @mohitjain2504
[Data] Cast Dataset.count() explicitly to int (ray-project#48273)
0a1e415 
## Why are these changes needed?

ray-project#48126 introduced a
`LogicalOperator` for calculating `Dataset.count()`. As an unintended
side effect, calculating `sum()` over numpy batches can result in
returning `np.int64` instead of a regular `int`. This PR explicitly
cases the result to an `int` before returning.

## Related issue number

Closes ray-project#48177,
ray-project#48176

## 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
   - [x] Release tests
   - [ ] This PR is not tested :(

Signed-off-by: Scott Lee <sjl@anyscale.com>
Signed-off-by: mohitjain2504 <mohit.jain@dream11.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@can-anyscale can-anyscale can-anyscale left review comments

@raulchen raulchen raulchen approved these changes

@scottjlee scottjlee Awaiting requested review from scottjlee scottjlee is a code owner

@stephanie-wang stephanie-wang Awaiting requested review from stephanie-wang stephanie-wang is a code owner

@omatthew98 omatthew98 Awaiting requested review from omatthew98 omatthew98 is a code owner

Assignees
No one assigned
Labels
go add ONLY when ready to merge, run all tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bveeramani @raulchen @can-anyscale