[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

examples/pipeline_tacotron2/text/text_preprocessing.py

@@ -25,7 +25,7 @@ Modified from https://github.com/keithito/tacotron
 """
 
 import re
-from typing import List, Union, Optional
+from typing import List, Optional, Union
 
 from torchaudio.datasets import CMUDict
 from unidecode import unidecode

examples/pipeline_tacotron2/train.py

@@ -50,11 +50,11 @@ from tqdm import tqdm
 
 plt.switch_backend("agg")
 
-from datasets import text_mel_collate_fn, split_process_dataset, SpectralNormalization
+from datasets import SpectralNormalization, split_process_dataset, text_mel_collate_fn
 from loss import Tacotron2Loss
 from text.text_preprocessing import (
-    available_symbol_set,
     available_phonemizers,
+    available_symbol_set,
     get_symbol_list,
     text_to_sequence,
 )

examples/pipeline_tacotron2/utils.py

@@ -28,7 +28,7 @@
 import logging
 import os
 import shutil
-from typing import List, Tuple, Callable
+from typing import Callable, List, Tuple
 
 import torch
 from torch import Tensor

examples/pipeline_wav2letter/main.py

@@ -10,14 +10,14 @@ import torchaudio
 from ctc_decoders import GreedyDecoder
 from datasets import collate_factory, split_process_librispeech
 from languagemodels import LanguageModel
-from torch.optim import SGD, Adadelta, Adam, AdamW
+from torch.optim import Adadelta, Adam, AdamW, SGD
 from torch.optim.lr_scheduler import ExponentialLR, ReduceLROnPlateau
 from torch.utils.data import DataLoader
 from torchaudio.datasets.utils import bg_iterator
 from torchaudio.functional import edit_distance
 from torchaudio.models.wav2letter import Wav2Letter
 from transforms import Normalize, UnsqueezeFirst
-from utils import MetricLogger, count_parameters, save_checkpoint
+from utils import count_parameters, MetricLogger, save_checkpoint
 
 
 def parse_args():

examples/pipeline_wavernn/datasets.py

@@ -3,7 +3,7 @@ import random
 import torch
 from processing import bits_to_normalized_waveform, normalized_waveform_to_bits
 from torch.utils.data.dataset import random_split
-from torchaudio.datasets import LJSPEECH, LIBRITTS
+from torchaudio.datasets import LIBRITTS, LJSPEECH
 from torchaudio.transforms import MuLawEncoding
 
 

examples/pipeline_wavernn/main.py

@@ -15,7 +15,7 @@ from torch.optim import Adam
 from torch.utils.data import DataLoader
 from torchaudio.datasets.utils import bg_iterator
 from torchaudio.models.wavernn import WaveRNN
-from utils import MetricLogger, count_parameters, save_checkpoint
+from utils import count_parameters, MetricLogger, save_checkpoint
 
 
 def parse_args():

examples/source_separation/eval.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 import mir_eval
 import torch
-from lightning_train import _get_model, _get_dataloader, sisdri_metric
+from lightning_train import _get_dataloader, _get_model, sisdri_metric
 
 
 def _eval(model, data_loader, device):

examples/source_separation/lightning_train.py

@@ -3,22 +3,12 @@
 # pyre-strict
 from argparse import ArgumentParser
 from pathlib import Path
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Mapping,
-    List,
-    Optional,
-    Tuple,
-    TypedDict,
-    Union,
-)
+from typing import Any, Callable, Dict, List, Mapping, Optional, Tuple, TypedDict, Union
 
 import torch
 import torchaudio
 from pytorch_lightning import LightningModule, Trainer
-from pytorch_lightning.callbacks import ModelCheckpoint, EarlyStopping
+from pytorch_lightning.callbacks import EarlyStopping, ModelCheckpoint
 from torch import nn
 from torch.optim.lr_scheduler import _LRScheduler
 from torch.utils.data import DataLoader

examples/source_separation/utils/__init__.py

-from . import (
-    dataset,
-    dist_utils,
-    metrics,
-)
+from . import dataset, dist_utils, metrics
 
 __all__ = ["dataset", "dist_utils", "metrics"]

examples/source_separation/utils/dataset/wsj0mix.py

 from pathlib import Path
-from typing import Union, Tuple, List
+from typing import List, Tuple, Union
 
 import torch
 import torchaudio

setup.py

@@ -8,7 +8,7 @@ import sys
 from pathlib import Path
 
 import torch
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 from tools import setup_helpers
 
 ROOT_DIR = Path(__file__).parent.resolve()

test/integration_tests/wav2vec2_pipeline_test.py

 import pytest
 import torchaudio
 from torchaudio.pipelines import (
-    WAV2VEC2_BASE,
-    WAV2VEC2_LARGE,
-    WAV2VEC2_LARGE_LV60K,
-    WAV2VEC2_ASR_BASE_10M,
-    WAV2VEC2_ASR_BASE_100H,
-    WAV2VEC2_ASR_BASE_960H,
-    WAV2VEC2_ASR_LARGE_10M,
-    WAV2VEC2_ASR_LARGE_100H,
-    WAV2VEC2_ASR_LARGE_960H,
-    WAV2VEC2_ASR_LARGE_LV60K_10M,
-    WAV2VEC2_ASR_LARGE_LV60K_100H,
-    WAV2VEC2_ASR_LARGE_LV60K_960H,
-    WAV2VEC2_XLSR53,
+    HUBERT_ASR_LARGE,
+    HUBERT_ASR_XLARGE,
     HUBERT_BASE,
     HUBERT_LARGE,
     HUBERT_XLARGE,
-    HUBERT_ASR_LARGE,
-    HUBERT_ASR_XLARGE,
+    VOXPOPULI_ASR_BASE_10K_DE,
     VOXPOPULI_ASR_BASE_10K_EN,
     VOXPOPULI_ASR_BASE_10K_ES,
-    VOXPOPULI_ASR_BASE_10K_DE,
     VOXPOPULI_ASR_BASE_10K_FR,
     VOXPOPULI_ASR_BASE_10K_IT,
+    WAV2VEC2_ASR_BASE_100H,
+    WAV2VEC2_ASR_BASE_10M,
+    WAV2VEC2_ASR_BASE_960H,
+    WAV2VEC2_ASR_LARGE_100H,
+    WAV2VEC2_ASR_LARGE_10M,
+    WAV2VEC2_ASR_LARGE_960H,
+    WAV2VEC2_ASR_LARGE_LV60K_100H,
+    WAV2VEC2_ASR_LARGE_LV60K_10M,
+    WAV2VEC2_ASR_LARGE_LV60K_960H,
+    WAV2VEC2_BASE,
+    WAV2VEC2_LARGE,
+    WAV2VEC2_LARGE_LV60K,
+    WAV2VEC2_XLSR53,
 )
 
 

test/torchaudio_unittest/backend/soundfile/info_test.py

@@ -5,20 +5,17 @@ from unittest.mock import patch
 import torch
 from torchaudio._internal import module_utils as _mod_utils
 from torchaudio.backend import soundfile_backend
-from torchaudio_unittest.backend.common import (
-    get_bits_per_sample,
-    get_encoding,
-)
+from torchaudio_unittest.backend.common import get_bits_per_sample, get_encoding
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    PytorchTestCase,
-    skipIfNoModule,
     get_wav_data,
-    save_wav,
     nested_params,
+    PytorchTestCase,
+    save_wav,
+    skipIfNoModule,
+    TempDirMixin,
 )
 
-from .common import skipIfFormatNotSupported, parameterize
+from .common import parameterize, skipIfFormatNotSupported
 
 if _mod_utils.is_module_available("soundfile"):
     import soundfile

test/torchaudio_unittest/backend/soundfile/load_test.py

@@ -7,20 +7,16 @@ from parameterized import parameterized
 from torchaudio._internal import module_utils as _mod_utils
 from torchaudio.backend import soundfile_backend
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    PytorchTestCase,
-    skipIfNoModule,
     get_wav_data,
-    normalize_wav,
     load_wav,
+    normalize_wav,
+    PytorchTestCase,
     save_wav,
+    skipIfNoModule,
+    TempDirMixin,
 )
 
-from .common import (
-    parameterize,
-    dtype2subtype,
-    skipIfFormatNotSupported,
-)
+from .common import dtype2subtype, parameterize, skipIfFormatNotSupported
 
 if _mod_utils.is_module_available("soundfile"):
     import soundfile

test/torchaudio_unittest/backend/soundfile/save_test.py

@@ -4,19 +4,15 @@ from unittest.mock import patch
 from torchaudio._internal import module_utils as _mod_utils
 from torchaudio.backend import soundfile_backend
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    PytorchTestCase,
-    skipIfNoModule,
     get_wav_data,
     load_wav,
     nested_params,
+    PytorchTestCase,
+    skipIfNoModule,
+    TempDirMixin,
 )
 
-from .common import (
-    fetch_wav_subtype,
-    parameterize,
-    skipIfFormatNotSupported,
-)
+from .common import fetch_wav_subtype, parameterize, skipIfFormatNotSupported
 
 if _mod_utils.is_module_available("soundfile"):
     import soundfile

test/torchaudio_unittest/backend/sox_io/info_test.py

@@ -8,26 +8,21 @@ from parameterized import parameterized
 from torchaudio._internal import module_utils as _mod_utils
 from torchaudio.backend import sox_io_backend
 from torchaudio.utils.sox_utils import get_buffer_size, set_buffer_size
-from torchaudio_unittest.backend.common import (
-    get_bits_per_sample,
-    get_encoding,
-)
+from torchaudio_unittest.backend.common import get_bits_per_sample, get_encoding
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
+    get_asset_path,
+    get_wav_data,
     HttpServerMixin,
     PytorchTestCase,
+    save_wav,
     skipIfNoExec,
     skipIfNoModule,
     skipIfNoSox,
-    get_asset_path,
-    get_wav_data,
-    save_wav,
     sox_utils,
+    TempDirMixin,
 )
 
-from .common import (
-    name_func,
-)
+from .common import name_func
 
 
 if _mod_utils.is_module_available("requests"):

test/torchaudio_unittest/backend/sox_io/load_test.py

@@ -6,22 +6,20 @@ from parameterized import parameterized
 from torchaudio._internal import module_utils as _mod_utils
 from torchaudio.backend import sox_io_backend
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
+    get_asset_path,
+    get_wav_data,
     HttpServerMixin,
+    load_wav,
     PytorchTestCase,
+    save_wav,
     skipIfNoExec,
     skipIfNoModule,
     skipIfNoSox,
-    get_asset_path,
-    get_wav_data,
-    load_wav,
-    save_wav,
     sox_utils,
+    TempDirMixin,
 )
 
-from .common import (
-    name_func,
-)
+from .common import name_func
 
 
 if _mod_utils.is_module_available("requests"):

test/torchaudio_unittest/backend/sox_io/roundtrip_test.py

@@ -3,17 +3,14 @@ import itertools
 from parameterized import parameterized
 from torchaudio.backend import sox_io_backend
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
+    get_wav_data,
     PytorchTestCase,
     skipIfNoExec,
     skipIfNoSox,
-    get_wav_data,
+    TempDirMixin,
 )
 
-from .common import (
-    name_func,
-    get_enc_params,
-)
+from .common import get_enc_params, name_func
 
 
 @skipIfNoExec("sox")

test/torchaudio_unittest/backend/sox_io/save_test.py

@@ -6,22 +6,19 @@ import torch
 from parameterized import parameterized
 from torchaudio.backend import sox_io_backend
 from torchaudio_unittest.common_utils import (
-    TempDirMixin,
-    TorchaudioTestCase,
-    PytorchTestCase,
-    skipIfNoExec,
-    skipIfNoSox,
     get_wav_data,
     load_wav,
+    nested_params,
+    PytorchTestCase,
     save_wav,
+    skipIfNoExec,
+    skipIfNoSox,
     sox_utils,
-    nested_params,
+    TempDirMixin,
+    TorchaudioTestCase,
 )
 
-from .common import (
-    name_func,
-    get_enc_params,
-)
+from .common import get_enc_params, name_func
 
 
 def _get_sox_encoding(encoding):

test/torchaudio_unittest/backend/sox_io/smoke_test.py

@@ -7,10 +7,10 @@ from torchaudio._internal.module_utils import is_sox_available
 from torchaudio.backend import sox_io_backend
 from torchaudio.utils import sox_utils
 from torchaudio_unittest.common_utils import (
+    get_wav_data,
+    skipIfNoSox,
     TempDirMixin,
     TorchaudioTestCase,
-    skipIfNoSox,
-    get_wav_data,
 )
 
 from .common import name_func