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 <[email protected]>
Lightning-AI · Jan 14, 2022 · d851103 · d851103
1 parent 7deadff
commit d851103
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git 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
@@ -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
@@ -15,14 +15,18 @@
 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
 from torchmetrics.functional.text.ter import translation_edit_rate  # noqa: F401
 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
@@ -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
@@ -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
@@ -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