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

2/n inter batch parallelism #9047

Merged
merged 41 commits into from
Aug 23, 2021
Merged

2/n inter batch parallelism #9047

merged 41 commits into from
Aug 23, 2021

Conversation

tchaton
Copy link
Contributor

@tchaton tchaton commented Aug 23, 2021

What does this PR do?

This PR adds DataFetcher to data_connector and loops.

Parts #8867
Parts #8316

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

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 list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is welcome to review the PR.
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?

Make sure you had fun coding 🙃

@codecov
Copy link

codecov bot commented Aug 23, 2021

Codecov Report

Merging #9047 (62c4384) into master (f3c5889) will increase coverage by 0%.
The diff coverage is 95%.

@@          Coverage Diff           @@
##           master   #9047   +/-   ##
======================================
  Coverage      89%     89%           
======================================
  Files         175     175           
  Lines       14463   14497   +34     
======================================
+ Hits        12812   12844   +32     
- Misses       1651    1653    +2     

@tchaton tchaton changed the base branch from master to 1/n_inter_batch_parallelism August 23, 2021 10:48
@mergify mergify bot removed the has conflicts label Aug 23, 2021
@tchaton tchaton requested review from carmocca and kaushikb11 August 23, 2021 16:16
@tchaton tchaton mentioned this pull request Aug 23, 2021
12 tasks
@mergify mergify bot added the ready PRs ready to be merged label Aug 23, 2021
@tchaton tchaton enabled auto-merge (squash) August 23, 2021 18:32
@tchaton tchaton merged commit 92c7eec into master Aug 23, 2021
@tchaton tchaton deleted the 2/n_inter_batch_parallelism branch August 23, 2021 19:30
Copy link

@aazzolini aazzolini left a comment

Choose a reason for hiding this comment

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

A few inline comments while trying to undestand the reasoning around some of the complexity in this diff and other diffs in the stack.

@@ -280,6 +280,8 @@ def _training_step(
training_step_output = self.trainer.accelerator.training_step(step_kwargs)
self.trainer.accelerator.post_training_step()

del step_kwargs

Choose a reason for hiding this comment

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

Why is this needed?

@@ -91,8 +91,9 @@ def advance(
if batch is None:
raise StopIteration

with self.trainer.profiler.profile("evaluation_batch_to_device"):
batch = self.trainer.accelerator.batch_to_device(batch, dataloader_idx=dataloader_idx)
if not self.trainer.data_connector.evaluation_data_fetcher.store_on_device:

Choose a reason for hiding this comment

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

Do we plan to remove this?

@@ -47,22 +47,27 @@ class SimpleDataFetcher(AbstractDataFetcher):
def fetching_function(self):
while True:
try:
yield next(self.dataloader_iter), False
return next(self.dataloader_iter), False

Choose a reason for hiding this comment

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

Why this change?
I am having a hard time to undertsand why we have a while loop that will only run for one iteration. It's not clear why this hasn't been replaced by an if statement, or why we didn't just remove the while loop here.

Also it seems that this function now became just semantically equivalent to implement next in a regular iterator, why do we still need this fecthing_function here?

@carmocca
Copy link
Contributor

@aazzolini I also noticed some of the things you mention here and opened #9058 to address them. Thanks for reviewing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature Is an improvement or enhancement ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants