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

LightningModule.log_dict: fix type hints for MetricCollection #18646

Merged
merged 3 commits into from
Sep 27, 2023
Merged

LightningModule.log_dict: fix type hints for MetricCollection #18646

merged 3 commits into from
Sep 27, 2023

Conversation

adamjstewart
Copy link
Contributor

@adamjstewart adamjstewart commented Sep 26, 2023

What does this PR do?

Fixes #18641

Before submitting
  • Was this discussed/agreed 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:

Reviewer checklist
  • 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

📚 Documentation preview 📚: https://pytorch-lightning--18646.org.readthedocs.build/en/18646/

@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Sep 26, 2023
@awaelchli awaelchli added the community This PR is from the community label Sep 26, 2023
@awaelchli awaelchli added this to the 2.1 milestone Sep 26, 2023
@awaelchli
Copy link
Contributor

By extension, the _log_dict_through_fabric() argument would need a small update too. LGTM thanks for the quick fix.

@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #18646 (350896f) into master (894952d) will decrease coverage by 35%.
Report is 4 commits behind head on master.
The diff coverage is 100%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #18646      +/-   ##
==========================================
- Coverage      85%      50%     -35%     
==========================================
  Files         427      419       -8     
  Lines       33432    33264     -168     
==========================================
- Hits        28449    16770   -11679     
- Misses       4983    16494   +11511     

@adamjstewart
Copy link
Contributor Author

Hmm, I assume we don't want to pass MetricCollection into lightning.fabric? And we don't want to turn Mapping[str, Any] into Any and make those type hints worse... I wonder if we could make MetricCollection a subtype of Mapping...

@mergify mergify bot added the ready PRs ready to be merged label Sep 26, 2023
@carmocca
Copy link
Contributor

Seems like there's one more instance to update:

src/lightning/pytorch/core/module.py:611: error: Argument "metrics" to "log_dict" of "Fabric" has incompatible type "Mapping[str, Metric | Tensor | int | float] | MetricCollection"; expected "Mapping[str, Any]"  [arg-type]

@carmocca
Copy link
Contributor

Ah sorry, I just saw your previous message. I would suggest that the error is ignored and you could propose making it a mapping subtype in torchmetrics in the meantime

@awaelchli awaelchli merged commit f8e6fa4 into Lightning-AI:master Sep 27, 2023
85 of 88 checks passed
@adamjstewart adamjstewart deleted the types/metriccollection branch September 27, 2023 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code quality community This PR is from the community pl Generic label for PyTorch Lightning package ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect type hints for log_dict(MetricCollection())?
3 participants