[codemod][usort] apply import merging for fbcode (8 of 11)

Summary:
Applies new import merging and sorting from µsort v1.0.

When merging imports, µsort will make a best-effort to move associated
comments to match merged elements, but there are known limitations due to
the diynamic nature of Python and developer tooling. These changes should
not produce any dangerous runtime changes, but may require touch-ups to
satisfy linters and other tooling.

Note that µsort uses case-insensitive, lexicographical sorting, which
results in a different ordering compared to isort. This provides a more
consistent sorting order, matching the case-insensitive order used when
sorting import statements by module name, and ensures that "frog", "FROG",
and "Frog" always sort next to each other.

For details on µsort's sorting and merging semantics, see the user guide:
https://usort.readthedocs.io/en/stable/guide.html#sorting

Reviewed By: lisroach

Differential Revision: D36402214

fbshipit-source-id: b641bfa9d46242188524d4ae2c44998922a62b4c

test/torchaudio_unittest/models/rnnt_decoder/rnnt_decoder_test_impl.py

 import torch
-from torchaudio.models import RNNTBeamSearch, emformer_rnnt_model
+from torchaudio.models import emformer_rnnt_model, RNNTBeamSearch
 from torchaudio_unittest.common_utils import TestBaseMixin, torch_script
 
 

test/torchaudio_unittest/models/tacotron2/model_test_cpu_test.py

@@ -2,8 +2,8 @@ import torch
 from torchaudio_unittest.common_utils import PytorchTestCase
 
 from .model_test_impl import (
-    Tacotron2EncoderTests,
     Tacotron2DecoderTests,
+    Tacotron2EncoderTests,
     Tacotron2Tests,
 )
 

test/torchaudio_unittest/models/tacotron2/model_test_gpu_test.py

 import torch
-from torchaudio_unittest.common_utils import skipIfNoCuda, PytorchTestCase
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 
 from .model_test_impl import (
-    Tacotron2EncoderTests,
     Tacotron2DecoderTests,
+    Tacotron2EncoderTests,
     Tacotron2Tests,
 )
 

test/torchaudio_unittest/models/tacotron2/model_test_impl.py

@@ -4,8 +4,8 @@ import torch
 from parameterized import parameterized
 from torch import Tensor
 from torchaudio.models import Tacotron2
-from torchaudio.models.tacotron2 import _Encoder, _Decoder
-from torchaudio_unittest.common_utils import TestBaseMixin, torch_script, skipIfPy310
+from torchaudio.models.tacotron2 import _Decoder, _Encoder
+from torchaudio_unittest.common_utils import skipIfPy310, TestBaseMixin, torch_script
 
 
 class Tacotron2InferenceWrapper(torch.nn.Module):

test/torchaudio_unittest/models/wav2vec2/fairseq_integration_test.py

@@ -3,16 +3,14 @@ import json
 import torch
 from parameterized import parameterized
 from torchaudio.models.wav2vec2 import (
-    wav2vec2_base,
-    wav2vec2_large,
-    wav2vec2_large_lv60k,
     hubert_base,
     hubert_large,
     hubert_xlarge,
+    wav2vec2_base,
+    wav2vec2_large,
+    wav2vec2_large_lv60k,
 )
-from torchaudio.models.wav2vec2.utils import (
-    import_fairseq_model,
-)
+from torchaudio.models.wav2vec2.utils import import_fairseq_model
 from torchaudio_unittest.common_utils import (
     get_asset_path,
     skipIfNoModule,
@@ -101,21 +99,12 @@ class TestFairseqIntegration(TorchaudioTestCase):
     def _get_model(self, config, num_out=None):
         import copy
 
-        from fairseq.models.hubert.hubert import (
-            HubertModel,
-            HubertConfig,
-        )
-        from fairseq.models.hubert.hubert_asr import (
-            HubertCtcConfig,
-            HubertEncoder,
-        )
-        from fairseq.models.wav2vec.wav2vec2 import (
-            Wav2Vec2Config,
-            Wav2Vec2Model,
-        )
+        from fairseq.models.hubert.hubert import HubertConfig, HubertModel
+        from fairseq.models.hubert.hubert_asr import HubertCtcConfig, HubertEncoder
+        from fairseq.models.wav2vec.wav2vec2 import Wav2Vec2Config, Wav2Vec2Model
         from fairseq.models.wav2vec.wav2vec2_asr import (
-            Wav2VecEncoder,
             Wav2Vec2CtcConfig,
+            Wav2VecEncoder,
         )
         from fairseq.tasks.hubert_pretraining import HubertPretrainingConfig
         from omegaconf import OmegaConf

test/torchaudio_unittest/models/wav2vec2/huggingface_intergration_test.py

@@ -78,8 +78,8 @@ class TestHFIntegration(TorchaudioTestCase):
         # the actual tests are started.
         from transformers.models.wav2vec2 import (
             Wav2Vec2Config,
-            Wav2Vec2Model,
             Wav2Vec2ForCTC,
+            Wav2Vec2Model,
         )
 
         if config["architectures"] == ["Wav2Vec2Model"]:

test/torchaudio_unittest/models/wav2vec2/model_test.py

@@ -5,18 +5,18 @@ import torch
 import torch.nn.functional as F
 from parameterized import parameterized
 from torchaudio.models.wav2vec2 import (
-    wav2vec2_base,
-    wav2vec2_large,
-    wav2vec2_large_lv60k,
     hubert_base,
     hubert_large,
     hubert_xlarge,
+    wav2vec2_base,
+    wav2vec2_large,
+    wav2vec2_large_lv60k,
 )
 from torchaudio_unittest.common_utils import (
-    TorchaudioTestCase,
-    skipIfNoQengine,
     skipIfNoCuda,
+    skipIfNoQengine,
     torch_script,
+    TorchaudioTestCase,
 )
 
 TORCH_VERSION: Tuple[int, ...] = tuple(int(x) for x in torch.__version__.split(".")[:2])

test/torchaudio_unittest/prototype/conv_emformer_gpu_test.py

 import torch
-from torchaudio_unittest.common_utils import skipIfNoCuda, PytorchTestCase
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 from torchaudio_unittest.prototype.conv_emformer_test_impl import ConvEmformerTestImpl
 
 

test/torchaudio_unittest/prototype/ctc_decoder_test.py

@@ -3,10 +3,10 @@ import itertools
 import torch
 from parameterized import parameterized
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    TorchaudioTestCase,
     get_asset_path,
     skipIfNoCtcDecoder,
+    TempDirMixin,
+    TorchaudioTestCase,
 )
 
 

test/torchaudio_unittest/prototype/rnnt_gpu_test.py

 import torch
-from torchaudio_unittest.common_utils import skipIfNoCuda, PytorchTestCase
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 from torchaudio_unittest.prototype.rnnt_test_impl import ConformerRNNTTestImpl
 
 

test/torchaudio_unittest/sox_effect/dataset_test.py

@@ -9,11 +9,11 @@ import numpy as np
 import torch
 import torchaudio
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    PytorchTestCase,
-    skipIfNoSox,
     get_whitenoise,
+    PytorchTestCase,
     save_wav,
+    skipIfNoSox,
+    TempDirMixin,
 )
 
 

test/torchaudio_unittest/sox_effect/smoke_test.py

 from parameterized import parameterized
 from torchaudio import sox_effects
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    TorchaudioTestCase,
-    skipIfNoSox,
-    get_wav_data,
     get_sinusoid,
+    get_wav_data,
     save_wav,
+    skipIfNoSox,
+    TempDirMixin,
+    TorchaudioTestCase,
 )
 
-from .common import (
-    load_params,
-)
+from .common import load_params
 
 
 @skipIfNoSox

test/torchaudio_unittest/sox_effect/sox_effect_test.py

@@ -7,24 +7,21 @@ from parameterized import parameterized
 from torchaudio import sox_effects
 from torchaudio._internal import module_utils as _mod_utils
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    HttpServerMixin,
-    PytorchTestCase,
-    skipIfNoSox,
-    skipIfNoModule,
-    skipIfNoExec,
     get_asset_path,
     get_sinusoid,
     get_wav_data,
-    save_wav,
+    HttpServerMixin,
     load_wav,
+    PytorchTestCase,
+    save_wav,
+    skipIfNoExec,
+    skipIfNoModule,
+    skipIfNoSox,
     sox_utils,
+    TempDirMixin,
 )
 
-from .common import (
-    load_params,
-    name_func,
-)
+from .common import load_params, name_func
 
 
 if _mod_utils.is_module_available("requests"):

test/torchaudio_unittest/sox_effect/torchscript_test.py

@@ -4,17 +4,15 @@ import torch
 from parameterized import parameterized
 from torchaudio import sox_effects
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    TorchaudioTestCase,
-    skipIfNoSox,
     get_sinusoid,
     save_wav,
+    skipIfNoSox,
+    TempDirMixin,
     torch_script,
+    TorchaudioTestCase,
 )
 
-from .common import (
-    load_params,
-)
+from .common import load_params
 
 
 class SoxEffectTensorTransform(torch.nn.Module):

test/torchaudio_unittest/transforms/autograd_cpu_test.py

 from torchaudio_unittest.common_utils import PytorchTestCase
 
-from .autograd_test_impl import AutogradTestMixin, AutogradTestFloat32
+from .autograd_test_impl import AutogradTestFloat32, AutogradTestMixin
 
 
 class AutogradCPUTest(AutogradTestMixin, PytorchTestCase):

test/torchaudio_unittest/transforms/autograd_cuda_test.py

-from torchaudio_unittest.common_utils import (
-    PytorchTestCase,
-    skipIfNoCuda,
-)
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 
-from .autograd_test_impl import AutogradTestMixin, AutogradTestFloat32
+from .autograd_test_impl import AutogradTestFloat32, AutogradTestMixin
 
 
 @skipIfNoCuda

test/torchaudio_unittest/transforms/autograd_test_impl.py

@@ -6,11 +6,11 @@ import torchaudio.transforms as T
 from parameterized import parameterized
 from torch.autograd import gradcheck, gradgradcheck
 from torchaudio_unittest.common_utils import (
-    TestBaseMixin,
-    get_whitenoise,
     get_spectrogram,
+    get_whitenoise,
     nested_params,
     rnnt_utils,
+    TestBaseMixin,
 )
 
 

test/torchaudio_unittest/transforms/librosa_compatibility_test_impl.py

@@ -5,11 +5,11 @@ import torchaudio.transforms as T
 from parameterized import param, parameterized
 from torchaudio._internal.module_utils import is_module_available
 from torchaudio_unittest.common_utils import (
-    TestBaseMixin,
-    get_whitenoise,
     get_sinusoid,
     get_spectrogram,
+    get_whitenoise,
     nested_params,
+    TestBaseMixin,
 )
 
 LIBROSA_AVAILABLE = is_module_available("librosa")

test/torchaudio_unittest/transforms/sox_compatibility_test.py

@@ -4,15 +4,15 @@ import torch
 import torchaudio.transforms as T
 from parameterized import parameterized
 from torchaudio_unittest.common_utils import (
-    skipIfNoSox,
-    skipIfNoExec,
-    TempDirMixin,
-    TorchaudioTestCase,
     get_asset_path,
-    sox_utils,
+    get_whitenoise,
     load_wav,
     save_wav,
-    get_whitenoise,
+    skipIfNoExec,
+    skipIfNoSox,
+    sox_utils,
+    TempDirMixin,
+    TorchaudioTestCase,
 )
 
 

test/torchaudio_unittest/transforms/torchscript_consistency_cuda_test.py

 import torch
-from torchaudio_unittest.common_utils import skipIfNoCuda, PytorchTestCase
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 
 from .torchscript_consistency_impl import Transforms, TransformsFloat32Only