From d851103037025e90891a94f9e34d6b17cd337ad0 Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Fri, 14 Jan 2022 23:33:37 +0100 Subject: [PATCH] rev domain imports (#757) * preserve conditional domain imports per domain Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Daniel Stancl <46073029+stancld@users.noreply.github.com> --- torchmetrics/detection/__init__.py | 1 - torchmetrics/functional/audio/__init__.py | 5 ++++- torchmetrics/functional/text/__init__.py | 6 +++++- torchmetrics/image/__init__.py | 7 ++++--- torchmetrics/image/kid.py | 2 +- torchmetrics/text/__init__.py | 5 ++++- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/torchmetrics/detection/__init__.py b/torchmetrics/detection/__init__.py index c3e33782896..76c26cbb34d 100644 --- a/torchmetrics/detection/__init__.py +++ b/torchmetrics/detection/__init__.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - from torchmetrics.utilities.imports import _TORCHVISION_GREATER_EQUAL_0_8 if _TORCHVISION_GREATER_EQUAL_0_8: diff --git a/torchmetrics/functional/audio/__init__.py b/torchmetrics/functional/audio/__init__.py index 7f5e71e14e5..c62ba6d0fc4 100644 --- a/torchmetrics/functional/audio/__init__.py +++ b/torchmetrics/functional/audio/__init__.py @@ -20,7 +20,10 @@ from torchmetrics.functional.audio.si_sdr import si_sdr # noqa: F401 from torchmetrics.functional.audio.si_snr import si_snr # noqa: F401 from torchmetrics.functional.audio.snr import scale_invariant_signal_noise_ratio, signal_noise_ratio, snr # noqa: F401 -from torchmetrics.utilities.imports import _PESQ_AVAILABLE +from torchmetrics.utilities.imports import _PESQ_AVAILABLE, _PYSTOI_AVAILABLE if _PESQ_AVAILABLE: from torchmetrics.functional.audio.pesq import perceptual_evaluation_speech_quality # noqa: F401 + +if _PYSTOI_AVAILABLE: + from torchmetrics.functional.audio.stoi import short_term_objective_intelligibility # noqa: F401 diff --git a/torchmetrics/functional/text/__init__.py b/torchmetrics/functional/text/__init__.py index 93ec450f8d0..e4e0161443a 100644 --- a/torchmetrics/functional/text/__init__.py +++ b/torchmetrics/functional/text/__init__.py @@ -15,6 +15,7 @@ from torchmetrics.functional.text.bleu import bleu_score # noqa: F401 from torchmetrics.functional.text.cer import char_error_rate # noqa: F401 from torchmetrics.functional.text.chrf import chrf_score # noqa: F401 +from torchmetrics.functional.text.eed import extended_edit_distance # noqa: F401 from torchmetrics.functional.text.mer import match_error_rate # noqa: F401 from torchmetrics.functional.text.sacre_bleu import sacre_bleu_score # noqa: F401 from torchmetrics.functional.text.squad import squad # noqa: F401 @@ -22,7 +23,10 @@ from torchmetrics.functional.text.wer import wer, word_error_rate # noqa: F401 from torchmetrics.functional.text.wil import word_information_lost # noqa: F401 from torchmetrics.functional.text.wip import word_information_preserved # noqa: F401 -from torchmetrics.utilities.imports import _TRANSFORMERS_AUTO_AVAILABLE +from torchmetrics.utilities.imports import _NLTK_AVAILABLE, _TRANSFORMERS_AUTO_AVAILABLE if _TRANSFORMERS_AUTO_AVAILABLE: from torchmetrics.functional.text.bert import bert_score # noqa: F401 + +if _NLTK_AVAILABLE: + from torchmetrics.functional.text.rouge import rouge_score # noqa: F401 diff --git a/torchmetrics/image/__init__.py b/torchmetrics/image/__init__.py index 7252f96ac22..b5c456a5e8c 100644 --- a/torchmetrics/image/__init__.py +++ b/torchmetrics/image/__init__.py @@ -11,7 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from torchmetrics.image.inception import InceptionScore # noqa: F401 +from torchmetrics.image.inception import IS, InceptionScore # noqa: F401 +from torchmetrics.image.kid import KID, KernelInceptionDistance # noqa: F401 from torchmetrics.image.psnr import PSNR, PeakSignalNoiseRatio # noqa: F401 from torchmetrics.image.ssim import ( # noqa: F401 SSIM, @@ -21,7 +22,7 @@ from torchmetrics.utilities.imports import _LPIPS_AVAILABLE, _TORCH_FIDELITY_AVAILABLE if _TORCH_FIDELITY_AVAILABLE: - from torchmetrics.image.fid import FrechetInceptionDistance # noqa: F401 + from torchmetrics.image.fid import FID, FrechetInceptionDistance # noqa: F401 if _LPIPS_AVAILABLE: - from torchmetrics.image.lpip import LearnedPerceptualImagePatchSimilarity # noqa: F401 + from torchmetrics.image.lpip import LPIPS, LearnedPerceptualImagePatchSimilarity # noqa: F401 diff --git a/torchmetrics/image/kid.py b/torchmetrics/image/kid.py index e1e41ed213d..b81364c89aa 100644 --- a/torchmetrics/image/kid.py +++ b/torchmetrics/image/kid.py @@ -18,8 +18,8 @@ from torch import Tensor from torch.nn import Module -from torchmetrics import Metric from torchmetrics.image.fid import NoTrainInceptionV3 +from torchmetrics.metric import Metric from torchmetrics.utilities import _future_warning, rank_zero_warn from torchmetrics.utilities.data import dim_zero_cat from torchmetrics.utilities.imports import _TORCH_FIDELITY_AVAILABLE diff --git a/torchmetrics/text/__init__.py b/torchmetrics/text/__init__.py index b88139f510a..f027218e9f6 100644 --- a/torchmetrics/text/__init__.py +++ b/torchmetrics/text/__init__.py @@ -22,7 +22,10 @@ from torchmetrics.text.wer import WER, WordErrorRate # noqa: F401 from torchmetrics.text.wil import WordInfoLost # noqa: F401 from torchmetrics.text.wip import WordInfoPreserved # noqa: F401 -from torchmetrics.utilities.imports import _TRANSFORMERS_AUTO_AVAILABLE +from torchmetrics.utilities.imports import _NLTK_AVAILABLE, _TRANSFORMERS_AUTO_AVAILABLE if _TRANSFORMERS_AUTO_AVAILABLE: from torchmetrics.text.bert import BERTScore # noqa: F401 + +if _NLTK_AVAILABLE: + from torchmetrics.text.rouge import ROUGEScore # noqa: F401