Remove comparison deps and skipIfs

Author: samanklesaria

.github/scripts/unittest-linux/install.sh

@@ -98,8 +98,8 @@ if [[ "$(python --version)" = *3.9* || "$(python --version)" = *3.10* ]]; then
 fi
 (
     set -x
-    conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} sox libvorbis parameterized 'requests>=2.20'
-    pip install kaldi-io SoundFile librosa coverage pytest pytest-cov scipy expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics flashlight-text git+https://github.com/kpu/kenlm
+    conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} libvorbis parameterized 'requests>=2.20'
+    pip install SoundFile coverage pytest pytest-cov scipy expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics flashlight-text git+https://github.com/kpu/kenlm
 
     # TODO: might be better to fix the single call to `pip install` above
     pip install pillow scipy "numpy>=1.26"

test/torchaudio_unittest/common_utils/__init__.py

@@ -15,9 +15,6 @@
     skipIfNoModule,
     skipIfNoQengine,
     skipIfNoRIR,
-    skipIfNoSox,
-    skipIfNoSoxDecoder,
-    skipIfNoSoxEncoder,
     skipIfPy310,
     skipIfRocm,
     TempDirMixin,
@@ -63,9 +60,6 @@ def inject_request(self, request):
     "skipIfNoMacOS",
     "skipIfNoModule",
     "skipIfNoRIR",
-    "skipIfNoSox",
-    "skipIfNoSoxDecoder",
-    "skipIfNoSoxEncoder",
     "skipIfRocm",
     "skipIfNoQengine",
     "skipIfNoFFmpeg",

test/torchaudio_unittest/common_utils/case_utils.py

@@ -206,28 +206,6 @@ def skipIfNoModule(module, display_name=None):
     reason="CUDA does not have enough memory.",
     key="CUDA_SMALL_MEMORY",
 )
-skipIfNoSox = _skipIf(
-    not _IS_SOX_AVAILABLE,
-    reason="Sox features are not available.",
-    key="NO_SOX",
-)
-
-
-def skipIfNoSoxDecoder(ext):
-    return _skipIf(
-        not _IS_SOX_AVAILABLE or ext not in torchaudio.utils.sox_utils.list_read_formats(),
-        f'sox does not handle "{ext}" for read.',
-        key="NO_SOX_DECODER",
-    )
-
-
-def skipIfNoSoxEncoder(ext):
-    return _skipIf(
-        not _IS_SOX_AVAILABLE or ext not in torchaudio.utils.sox_utils.list_write_formats(),
-        f'sox does not handle "{ext}" for write.',
-        key="NO_SOX_ENCODER",
-    )
-
 
 skipIfNoRIR = _skipIf(
     not torchaudio._extension._IS_RIR_AVAILABLE,

test/torchaudio_unittest/compliance/kaldi/kaldi_compatibility_impl.py

@@ -5,7 +5,6 @@
     get_asset_path,
     load_params,
     load_wav,
-    skipIfNoExec,
     TempDirMixin,
     TestBaseMixin,
     RequestMixin
@@ -19,7 +18,6 @@ def assert_equal(self, output, *, expected, rtol=None, atol=None):
         self.assertEqual(output, expected, rtol=rtol, atol=atol)
 
     @parameterized.expand(load_params("kaldi_test_fbank_args.jsonl"))
-    @skipIfNoExec("compute-fbank-feats")
     def test_fbank(self, kwargs):
         """fbank should be numerically compatible with compute-fbank-feats"""
         wave_file = get_asset_path("kaldi_file.wav")
@@ -30,7 +28,6 @@ def test_fbank(self, kwargs):
         self.assert_equal(result, expected=kaldi_result, rtol=1e-4, atol=1e-8)
 
     @parameterized.expand(load_params("kaldi_test_spectrogram_args.jsonl"))
-    @skipIfNoExec("compute-spectrogram-feats")
     def test_spectrogram(self, kwargs):
         """spectrogram should be numerically compatible with compute-spectrogram-feats"""
         wave_file = get_asset_path("kaldi_file.wav")
@@ -41,7 +38,6 @@ def test_spectrogram(self, kwargs):
         self.assert_equal(result, expected=kaldi_result, rtol=1e-4, atol=1e-6)
 
     @parameterized.expand(load_params("kaldi_test_mfcc_args.jsonl"))
-    @skipIfNoExec("compute-mfcc-feats")
     def test_mfcc(self, kwargs):
         """mfcc should be numerically compatible with compute-mfcc-feats"""
         wave_file = get_asset_path("kaldi_file.wav")

test/torchaudio_unittest/functional/functional_cpu_test.py

@@ -4,7 +4,7 @@
 import torchaudio.functional as F
 from parameterized import parameterized
 import unittest
-from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoSox, TorchaudioTestCase
+from torchaudio_unittest.common_utils import PytorchTestCase, TorchaudioTestCase
 
 from .functional_impl import Functional, FunctionalCPUOnly
 
@@ -24,7 +24,6 @@ class TestFunctionalFloat64(Functional, PytorchTestCase):
 
 
 @unittest.skip("deprecated")
-@skipIfNoSox
 class TestApplyCodec(TorchaudioTestCase):
     def _smoke_test(self, format, compression, check_num_frames):
         """

test/torchaudio_unittest/functional/kaldi_compatibility_test_impl.py

@@ -1,6 +1,6 @@
 import torch
 import torchaudio.functional as F
-from torchaudio_unittest.common_utils import skipIfNoExec, TempDirMixin, TestBaseMixin, RequestMixin
+from torchaudio_unittest.common_utils import TempDirMixin, TestBaseMixin, RequestMixin
 from torchaudio_unittest.common_utils.kaldi_utils import convert_args, run_kaldi
 
 
@@ -9,7 +9,6 @@ def assert_equal(self, output, *, expected, rtol=None, atol=None):
         expected = expected.to(dtype=self.dtype, device=self.device)
         self.assertEqual(output, expected, rtol=rtol, atol=atol)
 
-    @skipIfNoExec("apply-cmvn-sliding")
     def test_sliding_window_cmn(self):
         """sliding_window_cmn should be numerically compatible with apply-cmvn-sliding"""
         kwargs = {

test/torchaudio_unittest/functional/sox_compatibility_test.py

@@ -5,17 +5,13 @@
     get_whitenoise,
     load_wav,
     save_wav,
-    skipIfNoExec,
-    skipIfNoSox,
     sox_utils,
     TempDirMixin,
     TorchaudioTestCase,
     RequestMixin
 )
 
 
-@skipIfNoSox
-@skipIfNoExec("sox")
 class TestFunctionalFiltering(TempDirMixin, TorchaudioTestCase, RequestMixin):
     def run_sox_effect(self, input_file, effect):
         output_file = self.get_temp_path("expected.wav")

test/torchaudio_unittest/transforms/sox_compatibility_test.py

@@ -8,17 +8,13 @@
     get_whitenoise,
     load_wav,
     save_wav,
-    skipIfNoExec,
-    skipIfNoSox,
     sox_utils,
     TempDirMixin,
     TorchaudioTestCase,
     RequestMixin
 )
 
 
-@skipIfNoSox
-@skipIfNoExec("sox")
 class TestFunctionalFiltering(TempDirMixin, TorchaudioTestCase, RequestMixin):
     def run_sox_effect(self, input_file, effect):
         output_file = self.get_temp_path("expected.wav")

test/torchaudio_unittest/utils/sox_utils_test.py

@@ -1,8 +1,7 @@
 from torchaudio.utils import sox_utils
-from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoSox
+from torchaudio_unittest.common_utils import PytorchTestCase
 
 
-@skipIfNoSox
 class TestSoxUtils(PytorchTestCase):
     """Smoke tests for sox_util module"""