move to prints

Lightning-AI · Jan 13, 2022 · 0e87d9a · 0e87d9a
1 parent 05f7a0b
commit 0e87d9a
Show file tree

Hide file tree

Showing 38 changed files with 40 additions and 61 deletions.
diff --git a/torchmetrics/audio/pit.py b/torchmetrics/audio/pit.py
@@ -18,7 +18,7 @@
 
 from torchmetrics.functional.audio.pit import permutation_invariant_training
 from torchmetrics.metric import Metric
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class PermutationInvariantTraining(Metric):

diff --git a/torchmetrics/audio/sdr.py b/torchmetrics/audio/sdr.py
@@ -18,8 +18,8 @@
 
 from torchmetrics.functional.audio.sdr import scale_invariant_signal_distortion_ratio, signal_distortion_ratio
 from torchmetrics.metric import Metric
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.imports import _FAST_BSS_EVAL_AVAILABLE
-from torchmetrics.utilities.warn import _future_warning
 
 
 class SignalDistortionRatio(Metric):

diff --git a/torchmetrics/audio/si_sdr.py b/torchmetrics/audio/si_sdr.py
@@ -17,7 +17,7 @@
 from torch import Tensor
 
 from torchmetrics.audio.sdr import ScaleInvariantSignalDistortionRatio
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class SI_SDR(ScaleInvariantSignalDistortionRatio):

diff --git a/torchmetrics/audio/si_snr.py b/torchmetrics/audio/si_snr.py
@@ -17,7 +17,7 @@
 from torch import Tensor
 
 from torchmetrics.audio.snr import ScaleInvariantSignalNoiseRatio
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class SI_SNR(ScaleInvariantSignalNoiseRatio):

diff --git a/torchmetrics/audio/snr.py b/torchmetrics/audio/snr.py
@@ -18,7 +18,7 @@
 
 from torchmetrics.functional.audio.snr import scale_invariant_signal_noise_ratio, snr
 from torchmetrics.metric import Metric
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class SignalNoiseRatio(Metric):

diff --git a/torchmetrics/classification/f_beta.py b/torchmetrics/classification/f_beta.py
@@ -19,8 +19,8 @@
 
 from torchmetrics.classification.stat_scores import StatScores
 from torchmetrics.functional.classification.f_beta import _fbeta_compute
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.enums import AverageMethod
-from torchmetrics.utilities.warn import _future_warning
 
 
 class FBetaScore(StatScores):

diff --git a/torchmetrics/classification/hinge.py b/torchmetrics/classification/hinge.py
@@ -18,7 +18,7 @@
 
 from torchmetrics.functional.classification.hinge import MulticlassMode, _hinge_compute, _hinge_update
 from torchmetrics.metric import Metric
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class HingeLoss(Metric):

diff --git a/torchmetrics/classification/iou.py b/torchmetrics/classification/iou.py
@@ -17,7 +17,7 @@
 from deprecate import deprecated, void
 
 from torchmetrics.classification.jaccard import JaccardIndex
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class IoU(JaccardIndex):

diff --git a/torchmetrics/classification/matthews_corrcoef.py b/torchmetrics/classification/matthews_corrcoef.py
@@ -22,7 +22,7 @@
  _matthews_corrcoef_update,
 )
 from torchmetrics.metric import Metric
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class MatthewsCorrCoef(Metric):

diff --git a/torchmetrics/functional/audio/pit.py b/torchmetrics/functional/audio/pit.py
@@ -19,9 +19,9 @@
 from deprecate import deprecated, void
 from torch import Tensor
 
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.checks import _check_same_shape
 from torchmetrics.utilities.imports import _SCIPY_AVAILABLE
-from torchmetrics.utilities.warn import _future_warning
 
 # _ps_dict: cache of permutations
 # it's necessary to cache it, otherwise it will consume a large amount of time

diff --git a/torchmetrics/functional/audio/sdr.py b/torchmetrics/functional/audio/sdr.py
@@ -18,7 +18,6 @@
 from deprecate import deprecated, void
 
 from torchmetrics.utilities.imports import _FAST_BSS_EVAL_AVAILABLE, _TORCH_GREATER_EQUAL_1_8
-from torchmetrics.utilities.warn import _future_warning
 
 if _FAST_BSS_EVAL_AVAILABLE:
  if _TORCH_GREATER_EQUAL_1_8:
@@ -44,7 +43,7 @@
 
 from torch import Tensor
 
-from torchmetrics.utilities import rank_zero_warn
+from torchmetrics.utilities import _future_warning, rank_zero_warn
 from torchmetrics.utilities.checks import _check_same_shape
 
 

diff --git a/torchmetrics/functional/audio/si_sdr.py b/torchmetrics/functional/audio/si_sdr.py
@@ -17,7 +17,7 @@
 from torch import Tensor
 
 from torchmetrics.functional.audio import scale_invariant_signal_distortion_ratio
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 @deprecated(

diff --git a/torchmetrics/functional/audio/si_snr.py b/torchmetrics/functional/audio/si_snr.py
@@ -16,7 +16,7 @@
 from torch import Tensor
 
 from torchmetrics.functional.audio.snr import scale_invariant_signal_noise_ratio
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 @deprecated(target=scale_invariant_signal_noise_ratio, deprecated_in="0.7", remove_in="0.8", stream=_future_warning)

diff --git a/torchmetrics/functional/audio/snr.py b/torchmetrics/functional/audio/snr.py
@@ -17,8 +17,8 @@
 from torch import Tensor
 
 from torchmetrics.functional.audio.sdr import scale_invariant_signal_distortion_ratio
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.checks import _check_same_shape
-from torchmetrics.utilities.warn import _future_warning
 
 
 def signal_noise_ratio(preds: Tensor, target: Tensor, zero_mean: bool = False) -> Tensor:

diff --git a/torchmetrics/functional/classification/f_beta.py b/torchmetrics/functional/classification/f_beta.py
@@ -18,9 +18,9 @@
 from torch import Tensor
 
 from torchmetrics.functional.classification.stat_scores import _reduce_stat_scores, _stat_scores_update
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.enums import AverageMethod as AvgMethod
 from torchmetrics.utilities.enums import MDMCAverageMethod
-from torchmetrics.utilities.warn import _future_warning
 
 
 def _safe_divide(num: Tensor, denom: Tensor) -> Tensor:

diff --git a/torchmetrics/functional/classification/hinge.py b/torchmetrics/functional/classification/hinge.py
@@ -17,10 +17,10 @@
 from deprecate import deprecated, void
 from torch import Tensor, tensor
 
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.checks import _input_squeeze
 from torchmetrics.utilities.data import to_onehot
 from torchmetrics.utilities.enums import DataType, EnumStr
-from torchmetrics.utilities.warn import _future_warning
 
 
 class MulticlassMode(EnumStr):

diff --git a/torchmetrics/functional/classification/iou.py b/torchmetrics/functional/classification/iou.py
@@ -18,7 +18,7 @@
 from torch import Tensor
 
 from torchmetrics.functional.classification.jaccard import jaccard_index
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 @deprecated(target=jaccard_index, deprecated_in="0.7", remove_in="0.8", stream=_future_warning)

diff --git a/torchmetrics/functional/image/ms_ssim.py b/torchmetrics/functional/image/ms_ssim.py
@@ -19,7 +19,7 @@
 from typing_extensions import Literal
 
 from torchmetrics.functional.image.ssim import multiscale_structural_similarity_index_measure as _ms_ssim
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 @deprecated(target=_ms_ssim, deprecated_in="0.7", remove_in="0.8", stream=_future_warning)

diff --git a/torchmetrics/functional/image/psnr.py b/torchmetrics/functional/image/psnr.py
@@ -17,8 +17,7 @@
 from deprecate import deprecated, void
 from torch import Tensor, tensor
 
-from torchmetrics.utilities import rank_zero_warn, reduce
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning, rank_zero_warn, reduce
 
 
 def _psnr_compute(

diff --git a/torchmetrics/functional/image/ssim.py b/torchmetrics/functional/image/ssim.py
@@ -19,9 +19,9 @@
 from torch.nn import functional as F
 from typing_extensions import Literal
 
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.checks import _check_same_shape
 from torchmetrics.utilities.distributed import reduce
-from torchmetrics.utilities.warn import _future_warning
 
 
 def _gaussian(kernel_size: int, sigma: float, dtype: torch.dtype, device: torch.device) -> Tensor:

diff --git a/torchmetrics/functional/pairwise/manhatten.py b/torchmetrics/functional/pairwise/manhatten.py
@@ -17,7 +17,7 @@
 from torch import Tensor
 
 from torchmetrics.functional.pairwise.manhattan import pairwise_manhattan_distance
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 @deprecated(target=pairwise_manhattan_distance, deprecated_in="0.7", remove_in="0.8", stream=_future_warning)

diff --git a/torchmetrics/functional/text/bert.py b/torchmetrics/functional/text/bert.py
@@ -23,8 +23,8 @@
 from torch import Tensor
 from torch.utils.data import DataLoader, Dataset
 
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.imports import _TQDM_AVAILABLE, _TRANSFORMERS_AVAILABLE
-from torchmetrics.utilities.warn import _future_warning
 
 if _TRANSFORMERS_AVAILABLE:
  from transformers import AutoModel, AutoTokenizer

diff --git a/torchmetrics/functional/text/bleu.py b/torchmetrics/functional/text/bleu.py
@@ -24,7 +24,7 @@
 from deprecate import deprecated
 from torch import Tensor, tensor
 
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 def _count_ngram(ngram_input_list: Sequence[str], n_gram: int) -> Counter:

diff --git a/torchmetrics/functional/text/cer.py b/torchmetrics/functional/text/cer.py
@@ -19,7 +19,7 @@
 from torch import Tensor, tensor
 
 from torchmetrics.functional.text.helper import _edit_distance
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 def _cer_update(

diff --git a/torchmetrics/functional/text/sacre_bleu.py b/torchmetrics/functional/text/sacre_bleu.py
@@ -48,8 +48,8 @@
 from typing_extensions import Literal
 
 from torchmetrics.functional.text.bleu import _bleu_score_compute, _bleu_score_update
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.imports import _REGEX_AVAILABLE
-from torchmetrics.utilities.warn import _future_warning
 
 AVAILABLE_TOKENIZERS = ("none", "13a", "zh", "intl", "char")
 

diff --git a/torchmetrics/functional/text/wer.py b/torchmetrics/functional/text/wer.py
@@ -19,7 +19,7 @@
 from torch import Tensor, tensor
 
 from torchmetrics.functional.text.helper import _edit_distance
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 def _wer_update(

diff --git a/torchmetrics/image/psnr.py b/torchmetrics/image/psnr.py
@@ -19,8 +19,7 @@
 
 from torchmetrics.functional.image.psnr import _psnr_compute, _psnr_update
 from torchmetrics.metric import Metric
-from torchmetrics.utilities import rank_zero_warn
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning, rank_zero_warn
 
 
 class PeakSignalNoiseRatio(Metric):

diff --git a/torchmetrics/image/ssim.py b/torchmetrics/image/ssim.py
@@ -20,9 +20,8 @@
 
 from torchmetrics.functional.image.ssim import _multiscale_ssim_compute, _ssim_compute, _ssim_update
 from torchmetrics.metric import Metric
-from torchmetrics.utilities import rank_zero_warn
+from torchmetrics.utilities import _future_warning, rank_zero_warn
 from torchmetrics.utilities.data import dim_zero_cat
-from torchmetrics.utilities.warn import _future_warning
 
 
 class StructuralSimilarityIndexMeasure(Metric):

diff --git a/torchmetrics/regression/pearson.py b/torchmetrics/regression/pearson.py
@@ -19,7 +19,7 @@
 
 from torchmetrics.functional.regression.pearson import _pearson_corrcoef_compute, _pearson_corrcoef_update
 from torchmetrics.metric import Metric
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 def _final_aggregation(

diff --git a/torchmetrics/regression/spearman.py b/torchmetrics/regression/spearman.py
@@ -19,9 +19,8 @@
 
 from torchmetrics.functional.regression.spearman import _spearman_corrcoef_compute, _spearman_corrcoef_update
 from torchmetrics.metric import Metric
-from torchmetrics.utilities import rank_zero_warn
+from torchmetrics.utilities import _future_warning, rank_zero_warn
 from torchmetrics.utilities.data import dim_zero_cat
-from torchmetrics.utilities.warn import _future_warning
 
 
 class SpearmanCorrCoef(Metric):

diff --git a/torchmetrics/text/bert.py b/torchmetrics/text/bert.py
@@ -20,8 +20,8 @@
 from torchmetrics.functional import bert_score
 from torchmetrics.functional.text.bert import _preprocess_text
 from torchmetrics.metric import Metric
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.imports import _TRANSFORMERS_AVAILABLE
-from torchmetrics.utilities.warn import _future_warning
 
 if _TRANSFORMERS_AVAILABLE:
  from transformers import AutoTokenizer

diff --git a/torchmetrics/text/bleu.py b/torchmetrics/text/bleu.py
@@ -25,7 +25,7 @@
 
 from torchmetrics import Metric
 from torchmetrics.functional.text.bleu import _bleu_score_compute, _bleu_score_update, _tokenize_fn
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class BLEUScore(Metric):

diff --git a/torchmetrics/text/cer.py b/torchmetrics/text/cer.py
@@ -20,7 +20,7 @@
 
 from torchmetrics.functional.text.cer import _cer_compute, _cer_update
 from torchmetrics.metric import Metric
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class CharErrorRate(Metric):

diff --git a/torchmetrics/text/sacre_bleu.py b/torchmetrics/text/sacre_bleu.py
@@ -26,8 +26,8 @@
 from torchmetrics.functional.text.bleu import _bleu_score_update
 from torchmetrics.functional.text.sacre_bleu import _SacreBLEUTokenizer
 from torchmetrics.text.bleu import BLEUScore
+from torchmetrics.utilities import _future_warning
 from torchmetrics.utilities.imports import _REGEX_AVAILABLE
-from torchmetrics.utilities.warn import _future_warning
 
 AVAILABLE_TOKENIZERS = ("none", "13a", "zh", "intl", "char")
 

diff --git a/torchmetrics/text/wer.py b/torchmetrics/text/wer.py
@@ -19,7 +19,7 @@
 
 from torchmetrics.functional.text.wer import _wer_compute, _wer_update
 from torchmetrics.metric import Metric
-from torchmetrics.utilities.warn import _future_warning
+from torchmetrics.utilities import _future_warning
 
 
 class WordErrorRate(Metric):

diff --git a/torchmetrics/utilities/__init__.py b/torchmetrics/utilities/__init__.py
@@ -1,4 +1,3 @@
 from torchmetrics.utilities.data import apply_to_collection # noqa: F401
 from torchmetrics.utilities.distributed import class_reduce, reduce # noqa: F401
-from torchmetrics.utilities.prints import rank_zero_debug, rank_zero_info, rank_zero_warn # noqa: F401
-from torchmetrics.utilities.warn import _future_warning # noqa: F401
+from torchmetrics.utilities.prints import _future_warning, rank_zero_debug, rank_zero_info, rank_zero_warn # noqa: F401
diff --git a/torchmetrics/utilities/prints.py b/torchmetrics/utilities/prints.py
@@ -13,9 +13,11 @@
 # limitations under the License.
 import os
 import warnings
-from functools import wraps
+from functools import partial, wraps
 from typing import Any, Callable
 
+from _warnings import warn
+
 from torchmetrics import _logger as log
 
 
@@ -47,3 +49,4 @@ def _debug(*args: Any, **kwargs: Any) -> None:
 rank_zero_debug = rank_zero_only(_debug)
 rank_zero_info = rank_zero_only(_info)
 rank_zero_warn = rank_zero_only(_warn)
+_future_warning = partial(warn, category=FutureWarning)
diff --git a/torchmetrics/utilities/warn.py b/torchmetrics/utilities/warn.py