Skip to content

Conversation

@SeanNaren
Copy link
Contributor

@SeanNaren SeanNaren commented Feb 19, 2021

What does this PR do?

Fixes the broken API case where:

Trainer(gpus=1, plugins='ddp_sharded', accelerator='ddp')

Because of the logic within the accelerator connector, the plugin is never set correctly, and the accelerator takes priority. We reverse the priority, and I'll make an issue for a RFC to fix this API.

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?

Make sure you had fun coding 🙃

@SeanNaren SeanNaren added the bug Something isn't working label Feb 19, 2021
@SeanNaren SeanNaren added this to the 1.2.x milestone Feb 19, 2021
@SeanNaren SeanNaren self-assigned this Feb 19, 2021
@SeanNaren SeanNaren added the distributed Generic distributed-related topic label Feb 19, 2021
@codecov
Copy link

codecov bot commented Feb 19, 2021

Codecov Report

Merging #6089 (9062e15) into master (3bdc067) will increase coverage by 0%.
The diff coverage is 100%.

@@          Coverage Diff           @@
##           master   #6089   +/-   ##
======================================
  Coverage      93%     93%           
======================================
  Files         160     160           
  Lines       11402   11402           
======================================
+ Hits        10654   10657    +3     
+ Misses        748     745    -3     

@Borda Borda added the priority: 0 High priority task label Feb 19, 2021
@SeanNaren SeanNaren mentioned this pull request Feb 19, 2021
@SeanNaren SeanNaren disabled auto-merge February 20, 2021 00:55
@SeanNaren SeanNaren enabled auto-merge (squash) February 20, 2021 11:17
@mergify mergify bot removed the has conflicts label Feb 20, 2021
@SeanNaren SeanNaren merged commit 97a81c3 into master Feb 20, 2021
@SeanNaren SeanNaren deleted the fix/plugin_accelerator_conflict branch February 20, 2021 12:58
carmocca added a commit that referenced this pull request Feb 23, 2021
…accelerator (#6089)

* Give priority to plugins to set distributed mode, and then accelerator

* Add CHANGELOG.md

* Update CHANGELOG.md

* Remove very scary line

* Ensure we set cluster environment after slurm configured if necessary

* Simplify the fix with a reset

Co-authored-by: Carlos Mocholí <[email protected]>
lexierule pushed a commit that referenced this pull request Feb 24, 2021
…accelerator (#6089)

* Give priority to plugins to set distributed mode, and then accelerator

* Add CHANGELOG.md

* Update CHANGELOG.md

* Remove very scary line

* Ensure we set cluster environment after slurm configured if necessary

* Simplify the fix with a reset

Co-authored-by: Carlos Mocholí <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working distributed Generic distributed-related topic priority: 0 High priority task

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants