Skip to content

Commit

Permalink
move to utils
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda committed Jun 7, 2021
1 parent c4e369b commit 6b7d018
Show file tree
Hide file tree
Showing 44 changed files with 44 additions and 88 deletions.
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/accuracy.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Callable, Optional

from deprecate import void
from torchmetrics import Accuracy as _Accuracy

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class Accuracy(_Accuracy):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/auc.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Callable, Optional

from deprecate import void
from torchmetrics import AUC as _AUC

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class AUC(_AUC):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/auroc.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Callable, Optional

from deprecate import void
from torchmetrics import AUROC as _AUROC

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class AUROC(_AUROC):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Optional

from deprecate import void
from torchmetrics import AveragePrecision as _AveragePrecision

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class AveragePrecision(_AveragePrecision):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/confusion_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Optional

from deprecate import void
from torchmetrics import ConfusionMatrix as _ConfusionMatrix

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class ConfusionMatrix(_ConfusionMatrix):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/f_beta.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
# limitations under the License.
from typing import Any, Optional

from deprecate import void
from torchmetrics import F1 as _F1
from torchmetrics import FBeta as _FBeta

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class FBeta(_FBeta):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/hamming_distance.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Callable, Optional

from deprecate import void
from torchmetrics import HammingDistance as _HammingDistance

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class HammingDistance(_HammingDistance):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/iou.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Optional

from deprecate import void
from torchmetrics import IoU as _IoU

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class IoU(_IoU):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/precision_recall.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
# limitations under the License.
from typing import Any, Callable, Optional

from deprecate import void
from torchmetrics import Precision as _Precision
from torchmetrics import Recall as _Recall

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class Precision(_Precision):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Optional

from deprecate import void
from torchmetrics import PrecisionRecallCurve as _PrecisionRecallCurve

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class PrecisionRecallCurve(_PrecisionRecallCurve):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/roc.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Optional

from deprecate import void
from torchmetrics import ROC as _ROC

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class ROC(_ROC):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/classification/stat_scores.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.
from typing import Any, Callable, Optional

from deprecate import void
from torchmetrics import StatScores as _StatScores

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class StatScores(_StatScores):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/compositional.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
from typing import Callable, Union

import torch
from deprecate import void
from torchmetrics import Metric
from torchmetrics.metric import CompositionalMetric as _CompositionalMetric

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


class CompositionalMetric(_CompositionalMetric):
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/accuracy.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import Optional

import torch
from deprecate import void
from torchmetrics.functional import accuracy as _accuracy

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_accuracy)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/auc.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import torch
from deprecate import void
from torchmetrics.functional import auc as _auc

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_auc)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/auroc.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import Optional, Sequence

import torch
from deprecate import void
from torchmetrics.functional import auroc as _auroc

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_auroc)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/average_precision.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import List, Optional, Sequence, Union

import torch
from deprecate import void
from torchmetrics.functional import average_precision as _average_precision

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_average_precision)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/confusion_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import Optional

import torch
from deprecate import void
from torchmetrics.functional import confusion_matrix as _confusion_matrix

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_confusion_matrix)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/explained_variance.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import Sequence, Union

import torch
from deprecate import void
from torchmetrics.functional import explained_variance as _explained_variance

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_explained_variance)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/f_beta.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
from typing import Optional

import torch
from deprecate import void
from torchmetrics.functional import f1 as _f1
from torchmetrics.functional import fbeta as _fbeta

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_fbeta)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/hamming_distance.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import torch
from deprecate import void
from torchmetrics.functional import hamming_distance as _hamming_distance

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_hamming_distance)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/image_gradients.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import Tuple

import torch
from deprecate import void
from torchmetrics.functional import image_gradients as _image_gradients

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_image_gradients)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/iou.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import Optional

import torch
from deprecate import void
from torchmetrics.functional import iou as _iou

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void
from pytorch_lightning.utilities.imports import _TORCHMETRICS_GREATER_EQUAL_0_3, _TORCHMETRICS_LOWER_THAN_0_3


Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/mean_absolute_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.

import torch
from deprecate import void
from torchmetrics.functional import mean_absolute_error as _mean_absolute_error

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_mean_absolute_error)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/mean_relative_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.

import torch
from deprecate import void
from torchmetrics.functional.regression.mean_relative_error import mean_relative_error as _mean_relative_error

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_mean_relative_error)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/mean_squared_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.

import torch
from deprecate import void
from torchmetrics.functional import mean_squared_error as _mean_squared_error

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_mean_squared_error)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.

import torch
from deprecate import void
from torchmetrics.functional import mean_squared_log_error as _mean_squared_log_error

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_mean_squared_log_error)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/nlp.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
from typing import Sequence

import torch
from deprecate import void
from torchmetrics.functional import bleu_score as _bleu_score

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_bleu_score)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/precision_recall.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
from typing import Optional

import torch
from deprecate import void
from torchmetrics.functional import precision as _precision
from torchmetrics.functional import precision_recall as _precision_recall
from torchmetrics.functional import recall as _recall

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_precision)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import List, Optional, Sequence, Tuple, Union

import torch
from deprecate import void
from torchmetrics.functional import precision_recall_curve as _precision_recall_curve

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_precision_recall_curve)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/psnr.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
from typing import Optional, Tuple, Union

import torch
from deprecate import void
from torchmetrics.functional import psnr as _psnr

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_psnr)
Expand Down
3 changes: 1 addition & 2 deletions pytorch_lightning/metrics/functional/r2score.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
# limitations under the License.

import torch
from deprecate import void
from torchmetrics.functional import r2score as _r2score

from pytorch_lightning.metrics.utils import deprecated_metrics
from pytorch_lightning.metrics.utils import deprecated_metrics, void


@deprecated_metrics(target=_r2score)
Expand Down
Loading

0 comments on commit 6b7d018

Please sign in to comment.