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

Print ragged dict of metrics in EvaluationLoop._print_results properly #12857

Merged
merged 11 commits into from
Apr 28, 2022
Merged

Print ragged dict of metrics in EvaluationLoop._print_results properly #12857

merged 11 commits into from
Apr 28, 2022

Conversation

otaj
Copy link
Contributor

@otaj otaj commented Apr 22, 2022 •
edited by github-actions bot
Loading

What does this PR do?

Fixes #12799

EvaluationLoop._print_results is now capable to print ragged dicts. In addition, for multilevel dictionaries we concatenate all the keys in order to avoid collisions, so that sklearn.metrics.classification_report is fully supported

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 @edward-io @ananthsub @rohitgr7 @kamil-kaczmarek @Raalsky @Blaizzy @awaelchli

@otaj otaj added bug Something isn't working logging Related to the `LoggerConnector` and `log()` trainer: validate trainer: test labels Apr 22, 2022
@otaj otaj added this to the 1.6.x milestone Apr 22, 2022
@otaj otaj self-assigned this Apr 22, 2022
awaelchli
awaelchli approved these changes Apr 24, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@mergify mergify bot removed the has conflicts label Apr 27, 2022
carmocca
carmocca approved these changes Apr 28, 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.

Pushed a commit with some minor improvements!

pytorch_lightning/loops/dataloader/evaluation_loop.py Outdated Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Apr 28, 2022
@otaj otaj enabled auto-merge (squash) April 28, 2022 07:20
@otaj otaj merged commit 55b3bc3 into master Apr 28, 2022
@otaj otaj deleted the bugfix/print_confusion_matrix branch April 28, 2022 16:05
carmocca added a commit that referenced this pull request Apr 28, 2022
@otaj @carmocca
Print ragged dict of metrics in EvaluationLoop._print_results prope…
0d668c9 
…rly (#12857)

* first fix

* full bugfix + tests

* Apply Adrian's suggestion

* Add test with tensor(0)

* Minor code simplification

* change sorting to make the comment correct

Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
lexierule pushed a commit that referenced this pull request May 3, 2022
@otaj @carmocca @lexierule
Print ragged dict of metrics in EvaluationLoop._print_results prope…
08bb0a9 
…rly (#12857)

* first fix

* full bugfix + tests

* Apply Adrian's suggestion

* Add test with tensor(0)

* Minor code simplification

* change sorting to make the comment correct

Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
@rohitgr7 rohitgr7 mentioned this pull request Jul 1, 2022
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awaelchli awaelchli awaelchli approved these changes

@carmocca carmocca carmocca approved these changes

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@justusschock justusschock Awaiting requested review from justusschock justusschock is a code owner

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@Borda Borda Awaiting requested review from Borda Borda is a code owner

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@kaushikb11 kaushikb11 Awaiting requested review from kaushikb11

Assignees

@otaj otaj

Labels
bug Something isn't working logging Related to the `LoggerConnector` and `log()` ready PRs ready to be merged trainer: test trainer: validate
Projects
None yet
Milestone
pl:1.6.x
Development

Successfully merging this pull request may close these issues.

trainer.test cann't support _print_result the dict value of sklearn.metrics.classification_report
4 participants
@otaj @awaelchli @carmocca @rohitgr7