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

StreamingDataset: Cleanup chunks right away if the dataset doesn't fit within the cache #19168

Merged
merged 21 commits into from
Dec 18, 2023
Merged

StreamingDataset: Cleanup chunks right away if the dataset doesn't fit within the cache #19168

merged 21 commits into from
Dec 18, 2023

Conversation

tchaton
Copy link
Contributor

@tchaton tchaton commented Dec 15, 2023 •
edited by github-actions bot
Loading

What does this PR do?

This PR changes the eviction strategy in the following ways:

  • if the dataset is larger than the cache size, delete the chunks when it is used.
  • if the dataset is smaller than the cache size, the chunks won't get deleted.

Fixes #<issue_number>

Before submitting
  • Was this discussed/agreed via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or minor internal changes/refactors)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing, make sure you have read the review guidelines. In short, see the following bullet-list:

Reviewer checklist
  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

📚 Documentation preview 📚: https://pytorch-lightning--19168.org.readthedocs.build/en/19168/

cc @Borda

@github-actions github-actions bot added the data (external) litdata package label Dec 15, 2023
@tchaton tchaton marked this pull request as ready for review December 18, 2023 18:45
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 18, 2023 •
edited
Loading

⚡ Required checks status: All passing 🟢

Groups summary

🟢 lightning_data: CPU workflow
Check ID Status
data-cpu (macOS-11, lightning, 3.10, 2.1) success ✅
data-cpu (ubuntu-20.04, lightning, 3.10, 2.1) success ✅
data-cpu (windows-2022, lightning, 3.10, 2.1) success ✅

These checks are required after the changes to src/lightning/data/streaming/config.py, src/lightning/data/streaming/downloader.py, src/lightning/data/streaming/item_loader.py, src/lightning/data/streaming/reader.py, tests/tests_data/streaming/test_reader.py.

🟢 mypy
Check ID Status
mypy success ✅

These checks are required after the changes to src/lightning/data/streaming/config.py, src/lightning/data/streaming/downloader.py, src/lightning/data/streaming/item_loader.py, src/lightning/data/streaming/reader.py.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.8) success ✅
install-pkg (ubuntu-22.04, app, 3.11) success ✅
install-pkg (ubuntu-22.04, fabric, 3.8) success ✅
install-pkg (ubuntu-22.04, fabric, 3.11) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.8) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.11) success ✅
install-pkg (ubuntu-22.04, lightning, 3.8) success ✅
install-pkg (ubuntu-22.04, lightning, 3.11) success ✅
install-pkg (ubuntu-22.04, notset, 3.8) success ✅
install-pkg (ubuntu-22.04, notset, 3.11) success ✅
install-pkg (macOS-12, app, 3.8) success ✅
install-pkg (macOS-12, app, 3.11) success ✅
install-pkg (macOS-12, fabric, 3.8) success ✅
install-pkg (macOS-12, fabric, 3.11) success ✅
install-pkg (macOS-12, pytorch, 3.8) success ✅
install-pkg (macOS-12, pytorch, 3.11) success ✅
install-pkg (macOS-12, lightning, 3.8) success ✅
install-pkg (macOS-12, lightning, 3.11) success ✅
install-pkg (macOS-12, notset, 3.8) success ✅
install-pkg (macOS-12, notset, 3.11) success ✅
install-pkg (windows-2022, app, 3.8) success ✅
install-pkg (windows-2022, app, 3.11) success ✅
install-pkg (windows-2022, fabric, 3.8) success ✅
install-pkg (windows-2022, fabric, 3.11) success ✅
install-pkg (windows-2022, pytorch, 3.8) success ✅
install-pkg (windows-2022, pytorch, 3.11) success ✅
install-pkg (windows-2022, lightning, 3.8) success ✅
install-pkg (windows-2022, lightning, 3.11) success ✅
install-pkg (windows-2022, notset, 3.8) success ✅
install-pkg (windows-2022, notset, 3.11) success ✅

These checks are required after the changes to src/lightning/data/streaming/config.py, src/lightning/data/streaming/downloader.py, src/lightning/data/streaming/item_loader.py, src/lightning/data/streaming/reader.py.

Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@tchaton tchaton changed the title Debug lightning data StreamingDataset: Cleanup chunks right away if the dataset doesn't fit within the cache Dec 18, 2023
awaelchli
awaelchli reviewed Dec 18, 2023
View reviewed changes
src/lightning/data/streaming/reader.py Outdated Show resolved Hide resolved
src/lightning/data/streaming/reader.py Outdated Show resolved Hide resolved
src/lightning/data/streaming/reader.py Show resolved Hide resolved
src/lightning/data/streaming/downloader.py Outdated Show resolved Hide resolved
src/lightning/data/streaming/constants.py Outdated Show resolved Hide resolved
@tchaton tchaton requested a review from awaelchli December 18, 2023 19:28
awaelchli
awaelchli approved these changes Dec 18, 2023
View reviewed changes
src/lightning/data/streaming/reader.py Outdated Show resolved Hide resolved
src/lightning/data/streaming/reader.py Outdated Show resolved Hide resolved
lantiga
lantiga approved these changes Dec 18, 2023
View reviewed changes
Copy link
Collaborator

@lantiga lantiga left a comment

Choose a reason for hiding this comment

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

LGTM!

@mergify mergify bot added the ready PRs ready to be merged label Dec 18, 2023
@tchaton tchaton merged commit 0a5cca6 into master Dec 18, 2023
57 checks passed
@tchaton tchaton deleted the debug-lightning-data branch December 18, 2023 23:01
@awaelchli awaelchli added this to the 2.1.x milestone Dec 19, 2023
Borda pushed a commit that referenced this pull request Dec 19, 2023
@tchaton @Borda
StreamingDataset: Cleanup chunks right away if the dataset doesn't fi…
f753a64 
…t within the cache (#19168)

Co-authored-by: Adrian Wälchli <[email protected]>
Co-authored-by: thomas <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
(cherry picked from commit 0a5cca6)
lantiga pushed a commit that referenced this pull request Dec 20, 2023
@tchaton @lantiga
StreamingDataset: Cleanup chunks right away if the dataset doesn't fi…
835068b 
…t within the cache (#19168)

Co-authored-by: Adrian Wälchli <[email protected]>
Co-authored-by: thomas <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
(cherry picked from commit 0a5cca6)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awaelchli awaelchli awaelchli approved these changes

@lantiga lantiga lantiga approved these changes

Assignees
No one assigned
Labels
data (external) litdata package ready PRs ready to be merged
Projects
None yet
Milestone
2.1.x
Development

Successfully merging this pull request may close these issues.
3 participants
@tchaton @lantiga @awaelchli