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

Extract dataloader utilities from TrainerDataLoadingMixin #10145

Merged
merged 23 commits into from
Nov 19, 2021

Conversation

awaelchli
Copy link
Contributor

@awaelchli awaelchli commented Oct 25, 2021

What does this PR do?

Addresses the suggestion by @ananthsub to move some static methods of the TrainerDataLoadingMixin to utilities:
#9987 (comment)

  • Reduces the size of the TrainerDataLoadingMixin which we eventually want to remove anyway (Review Lightning architecture & API #7740)
  • All moved methods were static and are now functions, so no side effects are produced.
  • Code can be shared between Trainer and LightningLite without relying on importing TrainerDataLoadingMixin

Does your PR introduce any breaking changes? If yes, please list them.

No, because the methods were marked as "protected" (in reality they really are not, as we use them publicly. The "_" prefix is to discourage their use)

Before submitting

  • Was this discussed/approved 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 update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

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

  • 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

Did you have fun?

I made sure I had fun coding 🙃

Part of #1 (it's a lie, this is just here to avoid noisy GitHub bot)

cc @justusschock @awaelchli @akihironitta @tchaton @Borda

@awaelchli awaelchli added design Includes a design discussion refactor labels Oct 25, 2021
@awaelchli awaelchli mentioned this pull request Oct 26, 2021
23 tasks
@awaelchli awaelchli added this to the v1.6 milestone Oct 26, 2021
@awaelchli awaelchli added the data handling Generic data-related topic label Nov 18, 2021
Copy link
Contributor

@carmocca carmocca left a comment

Choose a reason for hiding this comment

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

Much better!

pytorch_lightning/plugins/training_type/ipu.py Outdated Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Nov 18, 2021
Copy link
Contributor

@tchaton tchaton left a comment

Choose a reason for hiding this comment

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

LGTM !

@awaelchli awaelchli enabled auto-merge (squash) November 18, 2021 18:57
@codecov
Copy link

codecov bot commented Nov 18, 2021

Codecov Report

Merging #10145 (e729650) into master (c09c9c7) will increase coverage by 0%.
The diff coverage is 94%.

❗ Current head e729650 differs from pull request most recent head 626ff06. Consider uploading reports for the commit 626ff06 to get more accurate results

@@           Coverage Diff            @@
##           master   #10145    +/-   ##
========================================
  Coverage      92%      92%            
========================================
  Files         178      178            
  Lines       16286    16400   +114     
========================================
+ Hits        14941    15057   +116     
+ Misses       1345     1343     -2     

@awaelchli awaelchli merged commit 8950354 into master Nov 19, 2021
@awaelchli awaelchli deleted the refactor/extract-dataloader-utils branch November 19, 2021 12:45
Raalsky pushed a commit to neptune-ai/pytorch-lightning that referenced this pull request Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data handling Generic data-related topic design Includes a design discussion ready PRs ready to be merged refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants