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

Sort out the dataloader idx logic for evaluation #10923

Merged
merged 7 commits into from
Dec 3, 2021

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Dec 3, 2021

What does this PR do?

  • Save the current dataloader idx in the ResultCollection instead of the LightningModule
  • Avoid leaking the dataloader idx logic from the EvaluationLoop (where it should be contained) to the EvaluationEpochLoop

Follow-up to #10810

This will enable an optimization where we don't compute the results multiple times when multiple dataloaders are used during evaluation.

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

None

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?
  • [n/a] Did you make sure to update the documentation with your changes? (if necessary)
  • [n/a] 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?
  • [n/a] Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

  • 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

cc @Borda @justusschock @awaelchli @akihironitta @carmocca @edward-io @ananthsub @ninginthecloud

@carmocca carmocca added refactor logging Related to the `LoggerConnector` and `log()` loops Related to the Loop API labels Dec 3, 2021
@carmocca carmocca added this to the 1.6 milestone Dec 3, 2021
@carmocca carmocca self-assigned this Dec 3, 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.

Very neat ! A very good step toward separating the LightningModule.

@mergify mergify bot added the ready PRs ready to be merged label Dec 3, 2021
@carmocca carmocca enabled auto-merge (squash) December 3, 2021 17:25
@carmocca carmocca merged commit a28b4cd into master Dec 3, 2021
@carmocca carmocca deleted the refactor/sort-dataloader-idx-eval-logic branch December 3, 2021 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
logging Related to the `LoggerConnector` and `log()` loops Related to the Loop API ready PRs ready to be merged refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants