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.

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

Improve StreamingDataset Speed #19114

Merged
merged 10 commits into from
Dec 5, 2023
Merged

Improve StreamingDataset Speed #19114

merged 10 commits into from
Dec 5, 2023

Conversation

tchaton
Copy link
Contributor

@tchaton tchaton commented Dec 5, 2023

What does this PR do?

Using this script, we found the reader and prepare thread interraction could lead to hanging over the locks to up to 8 seconds. This PR moves away from locks and uses queue instead to avoid losing any time to synchornize download and deletion of chunks.

# Subclass and override the '__getitem__' to add any transforms
class ResizedStreamingDataset(StreamingDataset):

    def __getitem__(self, index):
        img = super().__getitem__(index)
        # Note: This could have been done during optimization 
        # for faster data loading
        if img.shape[0] == 1:
            img = img.repeat((3, 1, 1))
        if img.shape[0] == 4:
            img = img[:3]
        return F.resize(img, (224, 224), antialias=True)


# To be used once you have optimized the data with lightning.data.optimize
dataset = ResizedStreamingDataset(input_dir=input_dir)

# Works out of the box with PyTorch DataLoader
dataloader = DataLoader(dataset, batch_size=64, num_workers=os.cpu_count(), prefetch_factor=8)

# Iterate over the dataset once
for batch in dataloader:
    pass

# Iterate over the dataset twice
for batch in dataloader:
    pass

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--19114.org.readthedocs.build/en/19114/

cc @Borda

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

github-actions bot commented Dec 5, 2023

⚡ 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/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/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/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.

@Borda Borda requested review from lantiga and awaelchli December 5, 2023 19:48
@mergify mergify bot added the ready PRs ready to be merged label Dec 5, 2023
@tchaton tchaton merged commit 4d15468 into master Dec 5, 2023
54 checks passed
@tchaton tchaton deleted the improve_speed branch December 5, 2023 19:50
Borda pushed a commit that referenced this pull request Dec 19, 2023
Co-authored-by: thomas <[email protected]>
(cherry picked from commit 4d15468)
lantiga pushed a commit that referenced this pull request Dec 20, 2023
Co-authored-by: thomas <[email protected]>
(cherry picked from commit 4d15468)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data (external) litdata package ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants