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.

Sign up for GitHub

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

Jump to bottom

Support logging for MetricCollection with compute groups #15580

Merged
merged 38 commits into from
Jan 12, 2023
Merged

Support logging for MetricCollection with compute groups #15580

merged 38 commits into from
Jan 12, 2023

Conversation

justusschock
Copy link
Member

@justusschock justusschock commented Nov 8, 2022 •
edited by github-actions bot
Loading

What does this PR do?

Fixes #13254

Adds native support for logging torchmetrics MetricCollection without destroying computegroups.

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?
  • 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 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 @carmocca @Blaizzy

@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Nov 8, 2022
@justusschock justusschock changed the title update logging Support logging for MetricCollection with compute groups Nov 8, 2022
SkafteNicki
SkafteNicki reviewed Nov 8, 2022
View reviewed changes
Copy link
Member

@SkafteNicki SkafteNicki left a comment

Choose a reason for hiding this comment

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

Typing probably needs to be updated here:
https://github.com/Lightning-AI/lightning/blob/2949ef29484edabd5277e25b5e075723f38936e6/src/pytorch_lightning/core/module.py#L468
together with the docstring

tests/tests_pytorch/trainer/logging_/test_logger_connector.py Outdated Show resolved Hide resolved
@justusschock justusschock marked this pull request as ready for review November 9, 2022 08:46
@justusschock justusschock self-assigned this Nov 9, 2022
@justusschock justusschock added the logging Related to the `LoggerConnector` and `log()` label Nov 9, 2022
@justusschock justusschock added this to the v1.9 milestone Nov 9, 2022
carmocca
carmocca suggested changes Nov 9, 2022
View reviewed changes
src/pytorch_lightning/utilities/types.py Outdated Show resolved Hide resolved
src/pytorch_lightning/core/module.py Show resolved Hide resolved
src/pytorch_lightning/core/module.py Show resolved Hide resolved
carmocca
carmocca approved these changes Nov 9, 2022
View reviewed changes
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.

LGTM

The override of .items() made me very confused. I don't think it was a good idea to reuse the API of python but have it take arguments. Anyways, that's out of the scope of this PR

tests/tests_pytorch/trainer/logging_/test_logger_connector.py Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Nov 10, 2022
@awaelchli
Copy link
Contributor

Ooops, IPU had a segmentation fault. Makes total sense!

@mergify mergify bot added has conflicts and removed ready PRs ready to be merged labels Nov 10, 2022
Borda
Borda approved these changes Nov 11, 2022
View reviewed changes
Copy link
Member

@Borda Borda left a comment •
edited
Loading

Choose a reason for hiding this comment

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

lgtm

@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Nov 11, 2022
@mergify mergify bot added has conflicts and removed ready PRs ready to be merged has conflicts labels Nov 12, 2022
@justusschock justusschock force-pushed the logging_metriccollection branch from d5009b5 to ffe3b9a Compare January 11, 2023 10:46
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Jan 11, 2023
@mergify mergify bot added the ready PRs ready to be merged label Jan 11, 2023
carmocca
carmocca approved these changes Jan 11, 2023
View reviewed changes
.azure/ipu-tests.yml Outdated Show resolved Hide resolved
src/pytorch_lightning/core/module.py Outdated Show resolved Hide resolved
src/pytorch_lightning/core/module.py Outdated Show resolved Hide resolved
@justusschock justusschock enabled auto-merge (squash) January 12, 2023 14:31
@justusschock justusschock merged commit 388f2f4 into master Jan 12, 2023
@justusschock justusschock deleted the logging_metriccollection branch January 12, 2023 14:53
nicolai86 pushed a commit that referenced this pull request Jan 12, 2023
@justusschock @nicolai86
Support logging for MetricCollection with compute groups (#15580)
49741b8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carmocca carmocca carmocca approved these changes

@SkafteNicki SkafteNicki SkafteNicki approved these changes

@tchaton tchaton tchaton approved these changes

@Borda Borda Borda approved these changes

@awaelchli awaelchli awaelchli approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@akihironitta akihironitta Awaiting requested review from akihironitta

Assignees

@justusschock justusschock

Labels
logging Related to the `LoggerConnector` and `log()` pl Generic label for PyTorch Lightning package ready PRs ready to be merged
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.

Native support for Torchmetrics MetricCollection
6 participants
@justusschock @awaelchli @Borda @carmocca @tchaton @SkafteNicki