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

Code cleaning after classification refactor 1/n #1251

Merged
merged 26 commits into from
Oct 12, 2022
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
feba96a
cleanup
SkafteNicki Oct 5, 2022
481e1e7
remove some more
SkafteNicki Oct 5, 2022
e36ab29
docs
SkafteNicki Oct 5, 2022
e03cd83
Merge branch 'master' into cleanup/1
SkafteNicki Oct 5, 2022
7b1ffdb
fix broken doctest
SkafteNicki Oct 5, 2022
b308bf1
Merge branch 'cleanup/1' of https://github.com/PyTorchLightning/metri…
SkafteNicki Oct 5, 2022
6c4fa8a
Merge branch 'master' into cleanup/1
SkafteNicki Oct 6, 2022
de3545a
remove tests
SkafteNicki Oct 6, 2022
ee6f476
Merge branch 'cleanup/1' of https://github.com/PyTorchLightning/metri…
SkafteNicki Oct 6, 2022
1c4731b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 6, 2022
1d03816
Merge branch 'master' into cleanup/1
SkafteNicki Oct 6, 2022
5238cde
Merge branch 'master' into cleanup/1
SkafteNicki Oct 8, 2022
36d13ab
remove old docs
SkafteNicki Oct 10, 2022
c1e14fd
Merge branch 'master' into cleanup/1
SkafteNicki Oct 11, 2022
f5f6c6b
Merge branch 'master' into cleanup/1
SkafteNicki Oct 11, 2022
2cf4c71
better changelog
SkafteNicki Oct 11, 2022
bd13e06
Apply suggestions from code review
Borda Oct 11, 2022
a4dc8a6
Apply suggestions from code review
Borda Oct 11, 2022
5116a52
Apply suggestions from code review
Borda Oct 11, 2022
c77621a
Merge branch 'master' into cleanup/1
Borda Oct 12, 2022
49095b2
Merge branch 'master' into cleanup/1
Borda Oct 12, 2022
df3bf57
Merge branch 'master' into cleanup/1
mergify[bot] Oct 12, 2022
badb5cc
fix
SkafteNicki Oct 12, 2022
b026818
fix
SkafteNicki Oct 12, 2022
826c937
Revert
SkafteNicki Oct 12, 2022
c35620f
fix doc linking
SkafteNicki Oct 12, 2022
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
18 changes: 16 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

-

- Removed deprecated `BinnedAveragePrecision`, `BinnedPrecisionRecallCurve`, `RecallAtFixedPrecision` ([#1251](https://github.com/Lightning-AI/metrics/pull/1251))
- Removed deprecated `LabelRankingAveragePrecision`, `LabelRankingLoss` and `CoverageError` ([#1251](https://github.com/Lightning-AI/metrics/pull/1251))
- Removed deprecated `KLDivergence` and `AUC` ([#1251](https://github.com/Lightning-AI/metrics/pull/1251))

### Fixed

Expand Down Expand Up @@ -71,6 +72,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Improved performance of retrieval metrics ([#1242](https://github.com/Lightning-AI/metrics/pull/1242))
- Changed `SSIM` and `MSSSIM` update to be online to reduce memory usage ([#1231](https://github.com/Lightning-AI/metrics/pull/1231))

### Deprecated

- Deprecated `BinnedAveragePrecision`, `BinnedPrecisionRecallCurve`, `BinnedRecallAtFixedPrecision` ([#1163](https://github.com/Lightning-AI/metrics/pull/1163))
* `BinnedAveragePrecision` -> use `AveragePrecision` with `thresholds` arg
* `BinnedPrecisionRecallCurve` -> use `AveragePrecisionRecallCurve` with `thresholds` arg
* `BinnedRecallAtFixedPrecision` -> use `RecallAtFixedPrecision` with `thresholds` arg
- Renamed and refactored `LabelRankingAveragePrecision`, `LabelRankingLoss` and `CoverageError` ([#1167](https://github.com/Lightning-AI/metrics/pull/1167))
* `LabelRankingAveragePrecision` -> `MultilabelRankingAveragePrecision`
* `LabelRankingLoss` -> `MultilabelRankingLoss`
* `CoverageError` -> `MultilabelCoverageError`
- Deprecated `KLDivergence` and `AUC` from classification package ([#1189](https://github.com/Lightning-AI/metrics/pull/1189))
* `KLDivergence` moved to `regression` package
* Instead of `AUC` use `torchmetrics.utils.compute.auc`

### Fixed

Expand Down
20 changes: 0 additions & 20 deletions docs/source/classification/auc.rst

This file was deleted.

14 changes: 0 additions & 14 deletions docs/source/classification/binned_average_precision.rst

This file was deleted.

14 changes: 0 additions & 14 deletions docs/source/classification/binned_precision_recall_curve.rst

This file was deleted.

14 changes: 0 additions & 14 deletions docs/source/classification/binned_recall_fixed_precision.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/source/classification/coverage_error.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@ Coverage Error
Module Interface
________________

.. autoclass:: torchmetrics.CoverageError
:noindex:

.. autoclass:: torchmetrics.classification.MultilabelCoverageError
:noindex:

Functional Interface
____________________

.. autofunction:: torchmetrics.functional.coverage_error
:noindex:

.. autofunction:: torchmetrics.functional.classification.multilabel_coverage_error
:noindex:
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,12 @@ Label Ranking Average Precision
Module Interface
________________

.. autoclass:: torchmetrics.LabelRankingAveragePrecision
:noindex:

.. autoclass:: torchmetrics.classification.MultilabelRankingAveragePrecision
:noindex:


Functional Interface
____________________

.. autofunction:: torchmetrics.functional.label_ranking_average_precision
:noindex:

.. autofunction:: torchmetrics.functional.classification.multilabel_ranking_average_precision
:noindex:
7 changes: 0 additions & 7 deletions docs/source/classification/label_ranking_loss.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,11 @@ Label Ranking Loss
Module Interface
________________

.. autoclass:: torchmetrics.LabelRankingLoss
:noindex:


.. autoclass:: torchmetrics.classification.MultilabelRankingLoss
:noindex:

Functional Interface
____________________

.. autofunction:: torchmetrics.functional.label_ranking_loss
:noindex:

.. autofunction:: torchmetrics.functional.classification.multilabel_ranking_loss
:noindex:
1 change: 0 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ Or directly from conda
pages/overview
pages/implement
pages/lightning
pages/classification
pages/retrieval

.. toctree::
Expand Down
101 changes: 0 additions & 101 deletions docs/source/pages/classification.rst

This file was deleted.

14 changes: 0 additions & 14 deletions src/torchmetrics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,19 @@
SignalNoiseRatio,
)
from torchmetrics.classification import ( # noqa: E402
AUC,
Borda marked this conversation as resolved.
Show resolved Hide resolved
AUROC,
ROC,
Accuracy,
AveragePrecision,
BinnedAveragePrecision,
BinnedPrecisionRecallCurve,
BinnedRecallAtFixedPrecision,
Borda marked this conversation as resolved.
Show resolved Hide resolved
CalibrationError,
CohenKappa,
ConfusionMatrix,
CoverageError,
Borda marked this conversation as resolved.
Show resolved Hide resolved
Dice,
F1Score,
FBetaScore,
HammingDistance,
HingeLoss,
JaccardIndex,
LabelRankingAveragePrecision,
LabelRankingLoss,
Borda marked this conversation as resolved.
Show resolved Hide resolved
MatthewsCorrCoef,
Precision,
PrecisionRecallCurve,
Expand Down Expand Up @@ -113,12 +106,8 @@
__all__ = [
"functional",
"Accuracy",
"AUC",
"AUROC",
"AveragePrecision",
"BinnedAveragePrecision",
"BinnedPrecisionRecallCurve",
"BinnedRecallAtFixedPrecision",
"BLEUScore",
"BootStrapper",
"CalibrationError",
Expand All @@ -130,7 +119,6 @@
"CohenKappa",
"ConfusionMatrix",
"CosineSimilarity",
"CoverageError",
"Dice",
"TweedieDevianceScore",
"ErrorRelativeGlobalDimensionlessSynthesis",
Expand All @@ -142,8 +130,6 @@
"HingeLoss",
"JaccardIndex",
"KLDivergence",
"LabelRankingAveragePrecision",
"LabelRankingLoss",
"MatchErrorRate",
"MatthewsCorrCoef",
"MaxMetric",
Expand Down
10 changes: 0 additions & 10 deletions src/torchmetrics/classification/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,14 @@
MultilabelStatScores,
StatScores,
)

from torchmetrics.classification.accuracy import Accuracy, BinaryAccuracy, MulticlassAccuracy, MultilabelAccuracy
from torchmetrics.classification.auc import AUC
from torchmetrics.classification.auroc import AUROC, BinaryAUROC, MulticlassAUROC, MultilabelAUROC
from torchmetrics.classification.average_precision import (
AveragePrecision,
BinaryAveragePrecision,
MulticlassAveragePrecision,
MultilabelAveragePrecision,
)
from torchmetrics.classification.binned_precision_recall import (
BinnedAveragePrecision,
BinnedPrecisionRecallCurve,
BinnedRecallAtFixedPrecision,
)
from torchmetrics.classification.calibration_error import (
BinaryCalibrationError,
CalibrationError,
Expand Down Expand Up @@ -92,9 +85,6 @@
Recall,
)
from torchmetrics.classification.ranking import (
CoverageError,
LabelRankingAveragePrecision,
LabelRankingLoss,
MultilabelCoverageError,
MultilabelRankingAveragePrecision,
MultilabelRankingLoss,
Expand Down
Loading