[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/example/emformer_rnnt/test_tedlium3_lightning.py

@@ -5,9 +5,9 @@ from unittest.mock import patch
 import torch
 from parameterized import parameterized
 from torchaudio._internal.module_utils import is_module_available
-from torchaudio_unittest.common_utils import TorchaudioTestCase, skipIfNoModule
+from torchaudio_unittest.common_utils import skipIfNoModule, TorchaudioTestCase
 
-from .utils import MockSentencePieceProcessor, MockCustomDataset, MockDataloader
+from .utils import MockCustomDataset, MockDataloader, MockSentencePieceProcessor
 
 if is_module_available("pytorch_lightning", "sentencepiece"):
     from asr.emformer_rnnt.tedlium3.lightning import TEDLIUM3RNNTModule

test/torchaudio_unittest/example/souce_sepration/wsj0mix_test.py

@@ -2,11 +2,11 @@ import os
 
 from source_separation.utils.dataset import wsj0mix
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    TorchaudioTestCase,
     get_whitenoise,
-    save_wav,
     normalize_wav,
+    save_wav,
+    TempDirMixin,
+    TorchaudioTestCase,
 )
 
 

test/torchaudio_unittest/example/tacotron2/tacotron2_loss_cpu_test.py

@@ -2,9 +2,9 @@ import torch
 from torchaudio_unittest.common_utils import PytorchTestCase
 
 from .tacotron2_loss_impl import (
+    Tacotron2LossGradcheckTests,
     Tacotron2LossShapeTests,
     Tacotron2LossTorchscriptTests,
-    Tacotron2LossGradcheckTests,
 )
 
 

test/torchaudio_unittest/example/tacotron2/tacotron2_loss_gpu_test.py

 import torch
-from torchaudio_unittest.common_utils import skipIfNoCuda, PytorchTestCase
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 
 from .tacotron2_loss_impl import (
+    Tacotron2LossGradcheckTests,
     Tacotron2LossShapeTests,
     Tacotron2LossTorchscriptTests,
-    Tacotron2LossGradcheckTests,
 )
 
 

test/torchaudio_unittest/example/tacotron2/tacotron2_loss_impl.py

 import torch
 from pipeline_tacotron2.loss import Tacotron2Loss
 from torch.autograd import gradcheck, gradgradcheck
-from torchaudio_unittest.common_utils import (
-    TestBaseMixin,
-    torch_script,
-)
+from torchaudio_unittest.common_utils import TestBaseMixin, torch_script
 
 
 class Tacotron2LossInputMixin(TestBaseMixin):

test/torchaudio_unittest/example/tacotron2/test_text_preprocessing.py

 from parameterized import parameterized
 from torchaudio._internal.module_utils import is_module_available
-from torchaudio_unittest.common_utils import TorchaudioTestCase, skipIfNoModule
+from torchaudio_unittest.common_utils import skipIfNoModule, TorchaudioTestCase
 
 if is_module_available("unidecode") and is_module_available("inflect"):
     from pipeline_tacotron2.text.numbers import (
-        _remove_commas,
-        _expand_pounds,
-        _expand_dollars,
         _expand_decimal_point,
-        _expand_ordinal,
+        _expand_dollars,
         _expand_number,
+        _expand_ordinal,
+        _expand_pounds,
+        _remove_commas,
     )
     from pipeline_tacotron2.text.text_preprocessing import text_to_sequence
 

test/torchaudio_unittest/functional/autograd_impl.py

@@ -7,10 +7,10 @@ from parameterized import parameterized
 from torch import Tensor
 from torch.autograd import gradcheck, gradgradcheck
 from torchaudio_unittest.common_utils import (
-    TestBaseMixin,
-    get_whitenoise,
     get_spectrogram,
+    get_whitenoise,
     rnnt_utils,
+    TestBaseMixin,
 )
 
 

test/torchaudio_unittest/functional/functional_cpu_test.py

@@ -3,7 +3,11 @@ import unittest
 import torch
 import torchaudio.functional as F
 from parameterized import parameterized
-from torchaudio_unittest.common_utils import PytorchTestCase, TorchaudioTestCase, skipIfNoSox
+from torchaudio_unittest.common_utils import (
+    PytorchTestCase,
+    skipIfNoSox,
+    TorchaudioTestCase,
+)
 
 from .functional_impl import Functional, FunctionalCPUOnly
 

test/torchaudio_unittest/functional/functional_impl.py

@@ -9,12 +9,12 @@ import torchaudio.functional as F
 from parameterized import parameterized
 from scipy import signal
 from torchaudio_unittest.common_utils import (
-    TestBaseMixin,
+    beamform_utils,
     get_sinusoid,
-    nested_params,
     get_whitenoise,
+    nested_params,
     rnnt_utils,
-    beamform_utils,
+    TestBaseMixin,
 )
 
 

test/torchaudio_unittest/functional/kaldi_compatibility_test_impl.py

@@ -9,10 +9,7 @@ from torchaudio_unittest.common_utils import (
     TempDirMixin,
     TestBaseMixin,
 )
-from torchaudio_unittest.common_utils.kaldi_utils import (
-    convert_args,
-    run_kaldi,
-)
+from torchaudio_unittest.common_utils.kaldi_utils import convert_args, run_kaldi
 
 
 class Kaldi(TempDirMixin, TestBaseMixin):

test/torchaudio_unittest/functional/librosa_compatibility_test_impl.py

@@ -14,10 +14,10 @@ if LIBROSA_AVAILABLE:
 
 
 from torchaudio_unittest.common_utils import (
-    TestBaseMixin,
-    nested_params,
-    get_whitenoise,
     get_spectrogram,
+    get_whitenoise,
+    nested_params,
+    TestBaseMixin,
 )
 
 

test/torchaudio_unittest/functional/sox_compatibility_test.py

 import torch
 import torchaudio.functional as F
 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/functional/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 Functional, FunctionalFloat32Only
 

test/torchaudio_unittest/functional/torchscript_consistency_impl.py

@@ -6,9 +6,9 @@ import torchaudio.functional as F
 from parameterized import parameterized
 from torchaudio_unittest import common_utils
 from torchaudio_unittest.common_utils import (
+    skipIfRocm,
     TempDirMixin,
     TestBaseMixin,
-    skipIfRocm,
     torch_script,
 )
 

test/torchaudio_unittest/io/stream_reader_test.py

 import torch
 from parameterized import parameterized
 from torchaudio_unittest.common_utils import (
-    TorchaudioTestCase,
-    TempDirMixin,
     get_asset_path,
+    get_image,
     get_wav_data,
-    save_wav,
-    skipIfNoFFmpeg,
-    nested_params,
     is_ffmpeg_available,
-    get_image,
+    nested_params,
     save_image,
+    save_wav,
+    skipIfNoFFmpeg,
+    TempDirMixin,
+    TorchaudioTestCase,
 )
 
 if is_ffmpeg_available():
     from torchaudio.io import (
         StreamReader,
+        StreamReaderSourceAudioStream,
         StreamReaderSourceStream,
         StreamReaderSourceVideoStream,
-        StreamReaderSourceAudioStream,
     )
 
 

test/torchaudio_unittest/models/conformer/conformer_gpu_test.py

 import torch
-from torchaudio_unittest.common_utils import skipIfNoCuda, PytorchTestCase
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
 from torchaudio_unittest.models.conformer.conformer_test_impl import ConformerTestImpl
 
 

test/torchaudio_unittest/models/emformer/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.models.emformer.emformer_test_impl import EmformerTestImpl
 
 

test/torchaudio_unittest/models/rnnt/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.models.rnnt.rnnt_test_impl import RNNTTestImpl
 
 

test/torchaudio_unittest/models/rnnt_decoder/rnnt_decoder_cpu_test.py

 import torch
 from torchaudio_unittest.common_utils import PytorchTestCase
-from torchaudio_unittest.models.rnnt_decoder.rnnt_decoder_test_impl import RNNTBeamSearchTestImpl
+from torchaudio_unittest.models.rnnt_decoder.rnnt_decoder_test_impl import (
+    RNNTBeamSearchTestImpl,
+)
 
 
 class RNNTBeamSearchFloat32CPUTest(RNNTBeamSearchTestImpl, PytorchTestCase):

test/torchaudio_unittest/models/rnnt_decoder/rnnt_decoder_gpu_test.py

 import torch
-from torchaudio_unittest.common_utils import skipIfNoCuda, PytorchTestCase
-from torchaudio_unittest.models.rnnt_decoder.rnnt_decoder_test_impl import RNNTBeamSearchTestImpl
+from torchaudio_unittest.common_utils import PytorchTestCase, skipIfNoCuda
+from torchaudio_unittest.models.rnnt_decoder.rnnt_decoder_test_impl import (
+    RNNTBeamSearchTestImpl,
+)
 
 
 @skipIfNoCuda