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

Fix tests related to DDP communication hooks #12878

Merged
merged 7 commits into from
Apr 27, 2022
Merged

Conversation

akihironitta
Copy link
Contributor

@akihironitta akihironitta commented Apr 26, 2022

What does this PR do?

Part of #12373.

Fixes DDP communication hook tests that are not running in our current CI setup.

Description of the changes

  • Removes DistributedDataParallel.get_ddp_logging_data() which only works with torch<1.9. In newer PyTorch, it's renamed to DistributedDataParallel._get_ddp_logging_data() -> Dict.
  • Moves assertions to DDPStrategy.teardown because DistributedDataParallel is not available after trainer.fit() runs as it gets removed during its teardown (related to [bugfix] Reduce memory leaks #8490).

How to verify the changes

Note that the modified tests don't run in this PR. To verify the changes here, please either

  • check out this GPU CI result running in Unpin CUDA docker image for GPU CI #12373 OR
  • run tests locally with PyTorch 1.10+:
    # from the host
    git clone https://github.com/PyTorchLightning/pytorch-lightning.git
    cd pytorch-lightning
    docker pull pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.11  # or torch1.10
    docker run --rm -it --gpus all --ipc host -v $(pwd):/work -w /work pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.11  # or torch1.10
    
    # inside the container
    export PL_RUN_STANDALONE_TESTS=1
    python -m pytest tests/strategies/test_ddp_strategy_with_comm_hook.py::test_ddp_fp16_compress_comm_hook
    python -m pytest tests/strategies/test_ddp_strategy_with_comm_hook.py::test_ddp_sgd_comm_hook
    python -m pytest tests/strategies/test_ddp_strategy_with_comm_hook.py::test_ddp_fp16_compress_wrap_sgd_comm_hook
    python -m pytest tests/strategies/test_ddp_strategy_with_comm_hook.py::test_ddp_post_local_sgd_comm_hook

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 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:

  • 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 🙃

cc @Borda @akihironitta @justusschock @kaushikb11 @awaelchli @rohitgr7

@akihironitta akihironitta added tests strategy: ddp DistributedDataParallel labels Apr 26, 2022
@akihironitta akihironitta added this to the 1.6.x milestone Apr 26, 2022
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.

Nice!

@mergify mergify bot added the ready PRs ready to be merged label Apr 27, 2022
@akihironitta akihironitta enabled auto-merge (squash) April 27, 2022 16:04
@akihironitta akihironitta merged commit f3e746c into master Apr 27, 2022
@akihironitta akihironitta deleted the tests/update-ddp-comm branch April 27, 2022 17:07
carmocca pushed a commit that referenced this pull request Apr 27, 2022
* Fix ddp_comm_hook tests

* Refactor ddp_comm_hook tests

Co-authored-by: Akihiro Nitta <akihiro@pytorchlightning.ai>
lexierule pushed a commit that referenced this pull request May 3, 2022
* Fix ddp_comm_hook tests

* Refactor ddp_comm_hook tests

Co-authored-by: Akihiro Nitta <akihiro@pytorchlightning.ai>
@rohitgr7 rohitgr7 mentioned this pull request Jul 1, 2022
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready PRs ready to be merged strategy: ddp DistributedDataParallel tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants