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

Add remaning sklearn metrics #2562

Merged
merged 45 commits into from
Aug 5, 2020
Merged

Add remaning sklearn metrics #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8a5443f
added balanced accuracy
Jul 8, 2020
9d87a94
added dcg score
Jul 8, 2020
433eb76
added mean absolute error
Jul 8, 2020
6ad09e5
added mean squared error
Jul 9, 2020
3ffb00b
fix
Jul 9, 2020
7b66b81
added mean squared log error
Jul 9, 2020
465b3f6
add median absolute error and r2 score
Jul 9, 2020
50a34e3
switch arguments
Jul 9, 2020
e676537
added mean poisson deviance
Jul 9, 2020
f00da52
add mean gamma deviance and mean tweedie deviance
Jul 9, 2020
228ac6c
fix styling
Jul 9, 2020
2987a1e
added explained variance score
Jul 9, 2020
11d5784
added cohen kappa score
Jul 9, 2020
49673cd
added hamming, hinge, jaccard
Jul 9, 2020
960ca7a
fix styling
Jul 9, 2020
2322eaf
update sklearn requirement to newer version
Jul 9, 2020
7e70b24
Merge branch 'master' into new_sklearn_metrics
SkafteNicki Aug 4, 2020
c28d853
update requirement
SkafteNicki Aug 4, 2020
bf3c884
fix doctest
SkafteNicki Aug 4, 2020
88159b0
fix tests
SkafteNicki Aug 4, 2020
7ad50aa
added balanced accuracy
Jul 8, 2020
8db8f88
added dcg score
Jul 8, 2020
1bb0765
added mean absolute error
Jul 8, 2020
76a9440
added mean squared error
Jul 9, 2020
bebe4ad
fix
Jul 9, 2020
d7f75bc
added mean squared log error
Jul 9, 2020
79902a8
add median absolute error and r2 score
Jul 9, 2020
ed6fe1d
switch arguments
Jul 9, 2020
fd0ac8b
added mean poisson deviance
Jul 9, 2020
7a56adb
add mean gamma deviance and mean tweedie deviance
Jul 9, 2020
a1a4ba9
fix styling
Jul 9, 2020
76a7b82
added explained variance score
Jul 9, 2020
d50d271
added cohen kappa score
Jul 9, 2020
3f0ccaa
added hamming, hinge, jaccard
Jul 9, 2020
82fc970
fix styling
Jul 9, 2020
4d55525
update sklearn requirement to newer version
Jul 9, 2020
9d9212a
fix doctest
SkafteNicki Aug 4, 2020
cae35c1
fix tests
SkafteNicki Aug 4, 2020
5b0e028
fix doctest
SkafteNicki Aug 5, 2020
64244c5
merge
SkafteNicki Aug 5, 2020
f6f540c
fix failing docs
SkafteNicki Aug 5, 2020
1b11bbe
fix test
SkafteNicki Aug 5, 2020
1b09b7b
trying to fix errors
SkafteNicki Aug 5, 2020
ce07987
Apply suggestions from code review
Borda Aug 5, 2020
2cf2f32
format
Borda Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

- Added support for Mean in DDP Sync ([#2568](https://github.com/PyTorchLightning/pytorch-lightning/pull/2568))

- Added remaining `sklearn` metrics: `AveragePrecision`, `BalancedAccuracy`, `CohenKappaScore`, `DCG`, `Hamming`, `Hinge`, `Jaccard`, `MeanAbsoluteError`, `MeanSquaredError`, `MeanSquaredLogError`, `MedianAbsoluteError`, `R2Score`, `MeanPoissonDeviance`, `MeanGammaDeviance`, `MeanTweedieDeviance`, `ExplainedVariance` ([#2562](https://github.com/PyTorchLightning/pytorch-lightning/pull/2562))

### Changed

- Truncated long version numbers in progress bar ([#2594](https://github.com/PyTorchLightning/pytorch-lightning/pull/2594))
Expand Down
90 changes: 90 additions & 0 deletions docs/source/metrics.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,30 @@ AveragePrecision (sk)
.. autofunction:: pytorch_lightning.metrics.sklearns.AveragePrecision
:noindex:

BalancedAccuracy (sk)
^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.BalancedAccuracy
:noindex:

CohenKappaScore (sk)
^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.CohenKappaScore
:noindex:

ConfusionMatrix (sk)
^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.ConfusionMatrix
:noindex:

DCG (sk)
^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.DCG
:noindex:

F1 (sk)
^^^^^^^

Expand All @@ -503,6 +520,24 @@ FBeta (sk)
.. autofunction:: pytorch_lightning.metrics.sklearns.FBeta
:noindex:

Hamming (sk)
^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.Hamming
:noindex:

Hinge (sk)
^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.Hinge
:noindex:

Jaccard (sk)
^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.Jaccard
:noindex:

Precision (sk)
^^^^^^^^^^^^^^

Expand Down Expand Up @@ -532,3 +567,58 @@ AUROC (sk)

.. autofunction:: pytorch_lightning.metrics.sklearns.AUROC
:noindex:

ExplainedVariance (sk)
^^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.ExplainedVariance
:noindex:

MeanAbsoluteError (sk)
^^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.MeanAbsoluteError
:noindex:

MeanSquaredError (sk)
^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.MeanSquaredError
:noindex:

MeanSquaredLogError (sk)
^^^^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.MeanSquaredLogError
:noindex:

MedianAbsoluteError (sk)
^^^^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.MedianAbsoluteError
:noindex:

R2Score (sk)
^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.R2Score
:noindex:

MeanPoissonDeviance (sk)
^^^^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.MeanPoissonDeviance
:noindex:

MeanGammaDeviance (sk)
^^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.MeanGammaDeviance
:noindex:

MeanTweedieDeviance (sk)
^^^^^^^^^^^^^^^^^^^^^^^^

.. autofunction:: pytorch_lightning.metrics.sklearns.MeanTweedieDeviance
:noindex:

Loading