From c66355dc408e5b4c3e21da8de57f10e13463113e Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Sun, 31 Jan 2021 10:03:01 +0100 Subject: [PATCH 01/11] fix flake tests --- .flake8 | 2 +- test/torchaudio_unittest/transforms_test.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.flake8 b/.flake8 index b4a5069f16..f344aec879 100644 --- a/.flake8 +++ b/.flake8 @@ -1,4 +1,4 @@ [flake8] max-line-length = 120 -ignore = E305,E402,E721,E741,F401,F403,F405,W503,W504,F999 +ignore = E305,E402,E721,E741,F405,W503,W504,F999 exclude = build,docs/source,_ext,third_party diff --git a/test/torchaudio_unittest/transforms_test.py b/test/torchaudio_unittest/transforms_test.py index 76628b1315..ab7b2ed981 100644 --- a/test/torchaudio_unittest/transforms_test.py +++ b/test/torchaudio_unittest/transforms_test.py @@ -1,5 +1,4 @@ import math -import unittest import torch import torchaudio From 5e945054b5f38511b0861a029580564859e59dd5 Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Sun, 31 Jan 2021 10:37:53 +0100 Subject: [PATCH 02/11] remove unused imports --- test/torchaudio_unittest/common_utils/__init__.py | 1 - test/torchaudio_unittest/compliance_kaldi_test.py | 1 - test/torchaudio_unittest/datasets/datasets_test.py | 2 -- test/torchaudio_unittest/kaldi_io_test.py | 2 -- test/torchaudio_unittest/soundfile_backend/save_test.py | 1 - test/torchaudio_unittest/sox_compatibility_test.py | 2 -- test/torchaudio_unittest/sox_effect/smoke_test.py | 1 - torchaudio/datasets/gtzan.py | 3 +-- torchaudio/datasets/ljspeech.py | 2 +- torchaudio/extension/extension.py | 1 - torchaudio/sox_effects/sox_effects.py | 1 - torchaudio/transforms.py | 1 - 12 files changed, 2 insertions(+), 16 deletions(-) diff --git a/test/torchaudio_unittest/common_utils/__init__.py b/test/torchaudio_unittest/common_utils/__init__.py index cf3e717116..73a4eeb39d 100644 --- a/test/torchaudio_unittest/common_utils/__init__.py +++ b/test/torchaudio_unittest/common_utils/__init__.py @@ -27,4 +27,3 @@ from .parameterized_utils import ( load_params, ) -from . import sox_utils diff --git a/test/torchaudio_unittest/compliance_kaldi_test.py b/test/torchaudio_unittest/compliance_kaldi_test.py index 43e9865e2f..c7b4149819 100644 --- a/test/torchaudio_unittest/compliance_kaldi_test.py +++ b/test/torchaudio_unittest/compliance_kaldi_test.py @@ -1,6 +1,5 @@ import os import math -import unittest import torch import torchaudio diff --git a/test/torchaudio_unittest/datasets/datasets_test.py b/test/torchaudio_unittest/datasets/datasets_test.py index cd04c4d447..fda0804ea6 100644 --- a/test/torchaudio_unittest/datasets/datasets_test.py +++ b/test/torchaudio_unittest/datasets/datasets_test.py @@ -1,5 +1,3 @@ -from torchaudio.datasets.librispeech import LIBRISPEECH -from torchaudio.datasets.speechcommands import SPEECHCOMMANDS from torchaudio.datasets.vctk import VCTK from torchaudio_unittest.common_utils import ( diff --git a/test/torchaudio_unittest/kaldi_io_test.py b/test/torchaudio_unittest/kaldi_io_test.py index 2153b4cc02..4ceeeebbc5 100644 --- a/test/torchaudio_unittest/kaldi_io_test.py +++ b/test/torchaudio_unittest/kaldi_io_test.py @@ -1,5 +1,3 @@ -import unittest - import torch import torchaudio.kaldi_io as kio diff --git a/test/torchaudio_unittest/soundfile_backend/save_test.py b/test/torchaudio_unittest/soundfile_backend/save_test.py index 5c36e0d126..2f2741c303 100644 --- a/test/torchaudio_unittest/soundfile_backend/save_test.py +++ b/test/torchaudio_unittest/soundfile_backend/save_test.py @@ -1,5 +1,4 @@ import io -import itertools from unittest.mock import patch from torchaudio._internal import module_utils as _mod_utils diff --git a/test/torchaudio_unittest/sox_compatibility_test.py b/test/torchaudio_unittest/sox_compatibility_test.py index ade98b2aeb..c68e529427 100644 --- a/test/torchaudio_unittest/sox_compatibility_test.py +++ b/test/torchaudio_unittest/sox_compatibility_test.py @@ -1,5 +1,3 @@ -import unittest - import torch import torchaudio.functional as F import torchaudio.transforms as T diff --git a/test/torchaudio_unittest/sox_effect/smoke_test.py b/test/torchaudio_unittest/sox_effect/smoke_test.py index 2a8d9e7ff9..3b2b34d3ec 100644 --- a/test/torchaudio_unittest/sox_effect/smoke_test.py +++ b/test/torchaudio_unittest/sox_effect/smoke_test.py @@ -10,7 +10,6 @@ save_wav, ) from .common import ( - name_func, load_params, ) diff --git a/torchaudio/datasets/gtzan.py b/torchaudio/datasets/gtzan.py index 4c91894be1..6c0b6246f3 100644 --- a/torchaudio/datasets/gtzan.py +++ b/torchaudio/datasets/gtzan.py @@ -1,7 +1,6 @@ import os -import warnings from pathlib import Path -from typing import Any, Tuple, Optional, Union +from typing import Tuple, Optional, Union import torchaudio from torch import Tensor diff --git a/torchaudio/datasets/ljspeech.py b/torchaudio/datasets/ljspeech.py index 99058dd83e..1a519242c3 100644 --- a/torchaudio/datasets/ljspeech.py +++ b/torchaudio/datasets/ljspeech.py @@ -1,6 +1,6 @@ import os import csv -from typing import List, Tuple, Union +from typing import Tuple, Union from pathlib import Path import torchaudio diff --git a/torchaudio/extension/extension.py b/torchaudio/extension/extension.py index b01ba13e39..5875f41023 100644 --- a/torchaudio/extension/extension.py +++ b/torchaudio/extension/extension.py @@ -1,6 +1,5 @@ import warnings import importlib -from collections import namedtuple import torch from torchaudio._internal import module_utils as _mod_utils diff --git a/torchaudio/sox_effects/sox_effects.py b/torchaudio/sox_effects/sox_effects.py index d94a776cd6..b7d0c3a0f1 100644 --- a/torchaudio/sox_effects/sox_effects.py +++ b/torchaudio/sox_effects/sox_effects.py @@ -1,5 +1,4 @@ import os -from pathlib import Path from typing import List, Tuple, Optional import torch diff --git a/torchaudio/transforms.py b/torchaudio/transforms.py index 87c7eac94a..ae128aa9f2 100644 --- a/torchaudio/transforms.py +++ b/torchaudio/transforms.py @@ -2,7 +2,6 @@ import math from typing import Callable, Optional -from warnings import warn import torch from torch import Tensor From 4206523c650859a87f20f7b6fc0c003d3e7a44b3 Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Sun, 31 Jan 2021 10:48:53 +0100 Subject: [PATCH 03/11] remove unused imports --- test/torchaudio_unittest/batch_consistency_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/torchaudio_unittest/batch_consistency_test.py b/test/torchaudio_unittest/batch_consistency_test.py index 78e3cd62f9..5a437eb742 100644 --- a/test/torchaudio_unittest/batch_consistency_test.py +++ b/test/torchaudio_unittest/batch_consistency_test.py @@ -1,5 +1,4 @@ """Test numerical consistency among single input and batched input.""" -import unittest import itertools from parameterized import parameterized From 1d052b8ee4cd287db0dfcaee5d6fbe1c90c9cecd Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Fri, 5 Feb 2021 00:02:39 +0100 Subject: [PATCH 04/11] noqa for __init__ --- test/torchaudio_unittest/common_utils/__init__.py | 5 +++++ torchaudio/__init__.py | 6 ++++++ torchaudio/backend/__init__.py | 6 +++--- torchaudio/functional/__init__.py | 8 ++++++++ torchaudio/models/__init__.py | 2 ++ torchaudio/sox_effects/__init__.py | 2 ++ 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/test/torchaudio_unittest/common_utils/__init__.py b/test/torchaudio_unittest/common_utils/__init__.py index 73a4eeb39d..8cc44c3529 100644 --- a/test/torchaudio_unittest/common_utils/__init__.py +++ b/test/torchaudio_unittest/common_utils/__init__.py @@ -27,3 +27,8 @@ from .parameterized_utils import ( load_params, ) + +__all__ = ['get_asset_path', 'get_whitenoise', 'get_sinusoid', 'set_audio_backend', + 'TempDirMixin', 'HttpServerMixin', 'TestBaseMixin', 'PytorchTestCase', 'TorchaudioTestCase', + 'skipIfNoCuda', 'skipIfNoExec', 'skipIfNoModule', 'skipIfNoExtension', 'skipIfNoSoxBackend', + 'get_wav_data', 'normalize_wav', 'load_wav', 'save_wav', 'load_params'] diff --git a/torchaudio/__init__.py b/torchaudio/__init__.py index be46d8a0f6..c758d97730 100644 --- a/torchaudio/__init__.py +++ b/torchaudio/__init__.py @@ -29,3 +29,9 @@ from .version import __version__, git_version # noqa: F401 except ImportError: pass + +__all__ = ['extension', '_mod_utils', 'compliance', 'datasets', 'kaldi_io', + 'utils', 'sox_effects', 'transforms', 'list_audio_backends', + 'get_audio_backend', 'set_audio_backend', 'save_encinfo', 'sox_signalinfo_t', + 'sox_encodinginfo_t', 'get_sox_option_t', 'get_sox_encoding_t', + 'get_sox_bool', 'SignalInfo', 'EncodingInfo'] diff --git a/torchaudio/backend/__init__.py b/torchaudio/backend/__init__.py index 0812c09cf4..bc36975055 100644 --- a/torchaudio/backend/__init__.py +++ b/torchaudio/backend/__init__.py @@ -1,4 +1,4 @@ -from . import utils +from . import utils from .utils import ( list_audio_backends, get_audio_backend, @@ -11,10 +11,10 @@ get_sox_option_t, get_sox_encoding_t, get_sox_bool, -) +) # noqa: F401 from .common import ( SignalInfo, - EncodingInfo, + EncodingInfo, # noqa: F401 ) diff --git a/torchaudio/functional/__init__.py b/torchaudio/functional/__init__.py index 688708296b..b63aa14949 100644 --- a/torchaudio/functional/__init__.py +++ b/torchaudio/functional/__init__.py @@ -41,3 +41,11 @@ treble_biquad, vad, ) + +__all__ = ['amplitude_to_DB', 'angle', 'complex_norm', 'compute_deltas', 'create_dct', + 'create_fb_matrix', 'DB_to_amplitude', 'detect_pitch_frequency', 'griffinlim', 'magphase', + 'mask_along_axis', 'mask_along_axis_iid', 'mu_law_encoding', 'mu_law_decoding', 'phase_vocoder', + 'sliding_window_cmn', 'spectrogram', 'spectral_centroid', 'allpass_biquad', 'band_biquad', + 'bandpass_biquad', 'bandreject_biquad', 'bass_biquad', 'biquad', 'contrast', 'dither', + 'dcshift', 'deemph_biquad', 'equalizer_biquad', 'flanger', 'gain', 'highpass_biquad', + 'lfilter', 'lowpass_biquad', 'overdrive', 'phaser', 'riaa_biquad', 'treble_biquad', 'vad'] diff --git a/torchaudio/models/__init__.py b/torchaudio/models/__init__.py index 55498fd7f6..76e91ff166 100644 --- a/torchaudio/models/__init__.py +++ b/torchaudio/models/__init__.py @@ -1,3 +1,5 @@ from .wav2letter import Wav2Letter from .wavernn import WaveRNN from .conv_tasnet import ConvTasNet + +__all__ = ['Wav2Letter', 'WaveRNN', 'ConvTasNet'] diff --git a/torchaudio/sox_effects/__init__.py b/torchaudio/sox_effects/__init__.py index 5baf406b10..c9f70f8052 100644 --- a/torchaudio/sox_effects/__init__.py +++ b/torchaudio/sox_effects/__init__.py @@ -12,3 +12,5 @@ import atexit init_sox_effects() atexit.register(shutdown_sox_effects) + +__all__ = ['init_sox_effects', 'shutdown_sox_effects', 'effect_names', 'apply_effects_tensor', 'apply_effects_file'] From b38cd24cbdb51c9693c19e068dba7d22d178eff7 Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Fri, 5 Feb 2021 00:13:59 +0100 Subject: [PATCH 05/11] remove flake for backend --- torchaudio/backend/__init__.py | 7 ++++--- torchaudio/compliance/__init__.py | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/torchaudio/backend/__init__.py b/torchaudio/backend/__init__.py index bc36975055..ff3a2014e7 100644 --- a/torchaudio/backend/__init__.py +++ b/torchaudio/backend/__init__.py @@ -1,4 +1,5 @@ -from . import utils +# flake8: noqa +from . import utils from .utils import ( list_audio_backends, get_audio_backend, @@ -11,10 +12,10 @@ get_sox_option_t, get_sox_encoding_t, get_sox_bool, -) # noqa: F401 +) from .common import ( SignalInfo, - EncodingInfo, # noqa: F401 + EncodingInfo, ) diff --git a/torchaudio/compliance/__init__.py b/torchaudio/compliance/__init__.py index ba354c371e..e520566c8a 100644 --- a/torchaudio/compliance/__init__.py +++ b/torchaudio/compliance/__init__.py @@ -1 +1,3 @@ from . import kaldi + +__all__ = ['kaldi'] From b1f7e02d8776c4386f60e523639ff0f88514f857 Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Fri, 5 Feb 2021 21:18:55 +0100 Subject: [PATCH 06/11] retest --- torchaudio/backend/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torchaudio/backend/__init__.py b/torchaudio/backend/__init__.py index ff3a2014e7..361935229f 100644 --- a/torchaudio/backend/__init__.py +++ b/torchaudio/backend/__init__.py @@ -1,4 +1,4 @@ -# flake8: noqa +# flake8: noqa from . import utils from .utils import ( list_audio_backends, From f4a2e16c276d206e1153a83ea12cd5ef579654ae Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Sat, 6 Feb 2021 11:46:34 +0100 Subject: [PATCH 07/11] fix flake8 issues --- test/torchaudio_unittest/torchscript_consistency_impl.py | 1 - torchaudio/__init__.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/torchaudio_unittest/torchscript_consistency_impl.py b/test/torchaudio_unittest/torchscript_consistency_impl.py index ba8c93a1a7..492e1e4a92 100644 --- a/test/torchaudio_unittest/torchscript_consistency_impl.py +++ b/test/torchaudio_unittest/torchscript_consistency_impl.py @@ -1,5 +1,4 @@ """Test suites for jit-ability and its numerical compatibility""" -import unittest import torch import torchaudio.transforms as T diff --git a/torchaudio/__init__.py b/torchaudio/__init__.py index 413dffd880..5fec11d924 100644 --- a/torchaudio/__init__.py +++ b/torchaudio/__init__.py @@ -31,7 +31,7 @@ except ImportError: pass -__all__ = ['extension', '_mod_utils', 'compliance', 'datasets', 'kaldi_io', +__all__ = ['extension', '_mod_utils', 'compliance', 'datasets', 'functional', 'kaldi_io', 'utils', 'sox_effects', 'transforms', 'list_audio_backends', 'get_audio_backend', 'set_audio_backend', 'save_encinfo', 'sox_signalinfo_t', 'sox_encodinginfo_t', 'get_sox_option_t', 'get_sox_encoding_t', From 9c962351c8f4d4b6f6fede38ab5813ac43b041ae Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Sat, 6 Feb 2021 12:24:19 +0100 Subject: [PATCH 08/11] rerun test --- test/torchaudio_unittest/torchscript_consistency_impl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/torchaudio_unittest/torchscript_consistency_impl.py b/test/torchaudio_unittest/torchscript_consistency_impl.py index 492e1e4a92..b530d56a1a 100644 --- a/test/torchaudio_unittest/torchscript_consistency_impl.py +++ b/test/torchaudio_unittest/torchscript_consistency_impl.py @@ -7,7 +7,7 @@ class Transforms(common_utils.TestBaseMixin): - """Implements test for Transforms that are performed for different devices""" + """Implements tests for Transforms that are performed for different devices""" def _assert_consistency(self, transform, tensor): tensor = tensor.to(device=self.device, dtype=self.dtype) transform = transform.to(device=self.device, dtype=self.dtype) From 9b5a475a9ee146c54b1ed5f3d39c7d67a52f654d Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Sun, 7 Feb 2021 02:56:01 +0100 Subject: [PATCH 09/11] rerun test --- test/torchaudio_unittest/torchscript_consistency_impl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/torchaudio_unittest/torchscript_consistency_impl.py b/test/torchaudio_unittest/torchscript_consistency_impl.py index b530d56a1a..492e1e4a92 100644 --- a/test/torchaudio_unittest/torchscript_consistency_impl.py +++ b/test/torchaudio_unittest/torchscript_consistency_impl.py @@ -7,7 +7,7 @@ class Transforms(common_utils.TestBaseMixin): - """Implements tests for Transforms that are performed for different devices""" + """Implements test for Transforms that are performed for different devices""" def _assert_consistency(self, transform, tensor): tensor = tensor.to(device=self.device, dtype=self.dtype) transform = transform.to(device=self.device, dtype=self.dtype) From 21aec35f13787991ace707867435bd2c2b07fa23 Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Mon, 8 Feb 2021 12:51:09 +0100 Subject: [PATCH 10/11] retest --- test/torchaudio_unittest/torchscript_consistency_impl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/torchaudio_unittest/torchscript_consistency_impl.py b/test/torchaudio_unittest/torchscript_consistency_impl.py index 492e1e4a92..b530d56a1a 100644 --- a/test/torchaudio_unittest/torchscript_consistency_impl.py +++ b/test/torchaudio_unittest/torchscript_consistency_impl.py @@ -7,7 +7,7 @@ class Transforms(common_utils.TestBaseMixin): - """Implements test for Transforms that are performed for different devices""" + """Implements tests for Transforms that are performed for different devices""" def _assert_consistency(self, transform, tensor): tensor = tensor.to(device=self.device, dtype=self.dtype) transform = transform.to(device=self.device, dtype=self.dtype) From 2e7f9ec4fc14ef0782ded3f6bb89cb9ae599f613 Mon Sep 17 00:00:00 2001 From: krishnakalyan3 Date: Mon, 8 Feb 2021 13:16:35 +0100 Subject: [PATCH 11/11] retest --- test/torchaudio_unittest/torchscript_consistency_impl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/torchaudio_unittest/torchscript_consistency_impl.py b/test/torchaudio_unittest/torchscript_consistency_impl.py index b530d56a1a..492e1e4a92 100644 --- a/test/torchaudio_unittest/torchscript_consistency_impl.py +++ b/test/torchaudio_unittest/torchscript_consistency_impl.py @@ -7,7 +7,7 @@ class Transforms(common_utils.TestBaseMixin): - """Implements tests for Transforms that are performed for different devices""" + """Implements test for Transforms that are performed for different devices""" def _assert_consistency(self, transform, tensor): tensor = tensor.to(device=self.device, dtype=self.dtype) transform = transform.to(device=self.device, dtype=self.dtype)