apply import merging for fbcode (3 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: D36402148

fbshipit-source-id: 8eab032f38c0af6c83b38e18cfb69506e32fa53e

classy_train.py

@@ -54,7 +54,7 @@
     TensorboardPlotHook,
     VisdomHook,
 )
-from classy_vision.tasks import FineTuningTask, build_task
+from classy_vision.tasks import build_task, FineTuningTask
 from classy_vision.trainer import DistributedTrainer, LocalTrainer
 from torchvision import set_image_backend, set_video_backend
 

classy_vision/dataset/classy_cifar.py

@@ -7,7 +7,7 @@
 from typing import Any, Callable, Dict, Optional, Union
 
 from classy_vision.dataset import ClassyDataset, register_dataset
-from classy_vision.dataset.transforms import ClassyTransform, build_transforms
+from classy_vision.dataset.transforms import build_transforms, ClassyTransform
 from torchvision.datasets.cifar import CIFAR10, CIFAR100
 
 

classy_vision/dataset/classy_synthetic_image.py

@@ -13,7 +13,7 @@
 from .classy_dataset import ClassyDataset
 from .core import RandomImageBinaryClassDataset
 from .transforms import build_transforms
-from .transforms.util import ImagenetConstants, build_field_transform_default_imagenet
+from .transforms.util import build_field_transform_default_imagenet, ImagenetConstants
 
 
 @register_dataset("synthetic_image")

classy_vision/dataset/classy_synthetic_image_streaming.py

@@ -12,8 +12,8 @@
 from classy_vision.dataset.dataloader_async_gpu_wrapper import DataloaderAsyncGPUWrapper
 from classy_vision.dataset.dataloader_limit_wrapper import DataloaderLimitWrapper
 from classy_vision.dataset.transforms.util import (
-    ImagenetConstants,
     build_field_transform_default_imagenet,
+    ImagenetConstants,
 )
 
 

classy_vision/dataset/image_path_dataset.py

@@ -11,7 +11,7 @@
 
 from . import ClassyDataset, register_dataset
 from .core import ListDataset
-from .transforms import ClassyTransform, TupleToMapTransform, build_transforms
+from .transforms import build_transforms, ClassyTransform, TupleToMapTransform
 
 
 def _is_torchvision_imagefolder(image_folder):

classy_vision/dataset/transforms/autoaugment.py

@@ -30,11 +30,9 @@
 # https://github.com/DeepVoltaire/AutoAugment/blob/master/autoaugment.py
 
 import random
-import random
-from enum import Enum, auto
+from enum import auto, Enum
 from functools import partial
-from typing import Any
-from typing import Tuple, Any, NamedTuple, Sequence, Callable
+from typing import Any, Callable, NamedTuple, Sequence, Tuple
 
 import numpy as np
 from classy_vision.dataset.transforms import ClassyTransform, register_transform

classy_vision/dataset/transforms/util.py

@@ -10,7 +10,7 @@
 
 import torchvision.transforms as transforms
 
-from . import ClassyTransform, build_transforms, register_transform
+from . import build_transforms, ClassyTransform, register_transform
 
 
 class ImagenetConstants:

classy_vision/dataset/transforms/util_video.py

@@ -11,7 +11,7 @@
 import torchvision.transforms as transforms
 import torchvision.transforms._transforms_video as transforms_video
 
-from . import ClassyTransform, build_transforms, register_transform
+from . import build_transforms, ClassyTransform, register_transform
 from .util import ApplyTransformToKey, ImagenetConstants, TupleToMapTransform
 
 

classy_vision/distributed/launch_ray.py

@@ -11,7 +11,7 @@
 import subprocess
 import sys
 import time
-from argparse import REMAINDER, ArgumentParser
+from argparse import ArgumentParser, REMAINDER
 from contextlib import closing
 
 import ray

classy_vision/hooks/constants.py

@@ -4,7 +4,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-from enum import Enum, auto
+from enum import auto, Enum
 
 
 class ClassyHookFunctions(Enum):

classy_vision/losses/multi_output_sum_loss.py

@@ -8,7 +8,7 @@
 
 import torch
 
-from . import ClassyLoss, build_loss, register_loss
+from . import build_loss, ClassyLoss, register_loss
 
 
 @register_loss("multi_output_sum_loss")

classy_vision/losses/sum_arbitrary_loss.py

@@ -9,7 +9,7 @@
 import torch
 from torch import Tensor
 
-from . import ClassyLoss, build_loss, register_loss
+from . import build_loss, ClassyLoss, register_loss
 
 
 @register_loss("sum_arbitrary")

classy_vision/models/anynet.py

@@ -6,7 +6,7 @@
 
 import math
 from collections import OrderedDict
-from enum import Enum, auto
+from enum import auto, Enum
 from typing import Any, Dict, Optional, Sequence
 
 import torch.nn as nn

classy_vision/models/regnet.py

@@ -13,12 +13,12 @@
 from classy_vision.models import register_model
 
 from .anynet import (
+    ActivationType,
     AnyNet,
     AnyNetParams,
-    StemType,
     BlockType,
-    ActivationType,
     RELU_IN_PLACE,
+    StemType,
 )
 
 

classy_vision/optim/classy_optimizer.py

@@ -9,11 +9,7 @@
 
 from classy_vision.generic.util import log_class_usage
 
-from .param_scheduler import (
-    ParamScheduler,
-    ConstantParamScheduler,
-    UpdateInterval,
-)
+from .param_scheduler import ConstantParamScheduler, ParamScheduler, UpdateInterval
 
 
 class OptionsView:

classy_vision/optim/param_scheduler/composite_scheduler.py

@@ -4,16 +4,12 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-from enum import Enum, auto
+from enum import auto, Enum
 from typing import Any, Dict, Sequence, Union
 
 from fvcore.common import param_scheduler
 
-from . import (
-    UpdateInterval,
-    build_param_scheduler,
-    register_param_scheduler,
-)
+from . import build_param_scheduler, register_param_scheduler, UpdateInterval
 
 
 class IntervalScaling(Enum):

classy_vision/optim/param_scheduler/fvcore_schedulers.py

@@ -6,11 +6,11 @@
 
 import copy
 import inspect
-from typing import Dict, Any
+from typing import Any, Dict
 
 from fvcore.common import param_scheduler
 
-from . import register_param_scheduler, ClassyParamScheduler, UpdateInterval
+from . import ClassyParamScheduler, register_param_scheduler, UpdateInterval
 
 
 """

classy_vision/optim/zero.py

@@ -9,7 +9,7 @@
 
 import torch.distributed as dist
 from classy_vision.generic.distributed_util import get_primary_rank
-from classy_vision.optim import ClassyOptimizer, build_optimizer, register_optimizer
+from classy_vision.optim import build_optimizer, ClassyOptimizer, register_optimizer
 
 
 try:

classy_vision/tasks/classification_task.py

@@ -16,7 +16,7 @@
 
 import torch
 import torch.nn as nn
-from classy_vision.dataset import ClassyDataset, build_dataset
+from classy_vision.dataset import build_dataset, ClassyDataset
 from classy_vision.dataset.transforms.mixup import MixupTransform
 from classy_vision.generic.distributed_util import (
     all_reduce_mean,
@@ -25,23 +25,23 @@
     is_distributed_training_run,
 )
 from classy_vision.generic.util import (
-    Timer,
     copy_model_to_gpu,
     get_torch_version,
     load_and_broadcast_checkpoint,
     master_params,
     recursive_copy_to_gpu,
     split_batchnorm_params,
+    Timer,
     update_classy_state,
 )
-from classy_vision.hooks import CheckpointHook, ClassyHook, build_hooks
-from classy_vision.losses import ClassyLoss, build_loss
-from classy_vision.meters import ClassyMeter, build_meters
-from classy_vision.models import ClassyModel, build_model
+from classy_vision.hooks import build_hooks, CheckpointHook, ClassyHook
+from classy_vision.losses import build_loss, ClassyLoss
+from classy_vision.meters import build_meters, ClassyMeter
+from classy_vision.models import build_model, ClassyModel
 from classy_vision.optim import (
-    ClassyOptimizer,
     build_optimizer,
     build_optimizer_schedulers,
+    ClassyOptimizer,
 )
 from classy_vision.optim.zero import ZeRO
 from torch.distributed import broadcast

classy_vision/templates/synthetic/datasets/my_dataset.py

@@ -12,7 +12,7 @@
     RandomImageBinaryClassDataset,
     SampleType,
 )
-from classy_vision.dataset.transforms import ClassyTransform, build_transforms
+from classy_vision.dataset.transforms import build_transforms, ClassyTransform
 
 
 @register_dataset("my_dataset")

test/classy_vision_head_test.py

@@ -7,7 +7,7 @@
 import unittest
 
 import torch
-from classy_vision.heads import ClassyHead, build_head, register_head
+from classy_vision.heads import build_head, ClassyHead, register_head
 
 
 class TestClassyHead(unittest.TestCase):

test/dataset_image_path_dataset_test.py

@@ -10,7 +10,7 @@
 import unittest
 
 import torch
-from classy_vision.dataset import ClassyDataset, build_dataset
+from classy_vision.dataset import build_dataset, ClassyDataset
 from classy_vision.dataset.image_path_dataset import ImagePathDataset
 from torchvision import transforms
 

test/dataset_transforms_test.py

@@ -9,8 +9,8 @@
 import torch
 import torchvision.transforms as transforms
 from classy_vision.dataset.transforms import (
-    ClassyTransform,
     build_transforms,
+    ClassyTransform,
     register_transform,
 )
 from classy_vision.dataset.transforms.util import ImagenetNoAugmentTransform

test/dataset_transforms_util_test.py

@@ -17,10 +17,10 @@
 )
 from classy_vision.dataset.transforms import build_transforms
 from classy_vision.dataset.transforms.util import (
+    build_field_transform_default_imagenet,
     GenericImageTransform,
     ImagenetAugmentTransform,
     ImagenetNoAugmentTransform,
-    build_field_transform_default_imagenet,
 )
 
 

test/dataset_transforms_util_video_test.py

@@ -11,8 +11,8 @@
 import torchvision.transforms._transforms_video as transforms_video
 from classy_vision.dataset.core.random_video_datasets import RandomVideoDataset
 from classy_vision.dataset.transforms.util_video import (
-    VideoConstants,
     build_video_field_transform_default,
+    VideoConstants,
 )
 
 

test/generic_util_test.py

@@ -16,11 +16,11 @@
 import torch.nn as nn
 from classy_vision.generic.util import (
     CHECKPOINT_FILE,
-    Timer,
     get_torch_version,
     load_checkpoint,
     save_checkpoint,
     split_batchnorm_params,
+    Timer,
     update_classy_model,
     update_classy_state,
 )

test/hooks_classy_hook_test.py

@@ -7,7 +7,7 @@
 import copy
 import unittest
 
-from classy_vision.hooks import ClassyHook, build_hook, build_hooks, register_hook
+from classy_vision.hooks import build_hook, build_hooks, ClassyHook, register_hook
 
 
 @register_hook("test_hook")

test/hooks_loss_lr_meter_logging_hook_test.py

@@ -11,7 +11,7 @@
 
 from classy_vision.hooks import ClassyHook, LossLrMeterLoggingHook
 from classy_vision.optim.param_scheduler import ClassyParamScheduler, UpdateInterval
-from classy_vision.tasks import ClassyTask, build_task
+from classy_vision.tasks import build_task, ClassyTask
 from classy_vision.trainer import LocalTrainer
 from test.generic.config_utils import get_test_mlp_task_config, get_test_task_config
 from test.generic.hook_test_utils import HookTestBase

test/hub_classy_hub_interface_test.py

@@ -11,8 +11,8 @@
 import torch
 from classy_vision.dataset.transforms import ClassyTransform
 from classy_vision.hub import ClassyHubInterface
-from classy_vision.models import ClassyModel, build_model
-from classy_vision.tasks import ClassyTask, build_task
+from classy_vision.models import build_model, ClassyModel
+from classy_vision.tasks import build_task, ClassyTask
 from test.generic.config_utils import get_test_task_config
 from torchvision import models, transforms
 

test/losses_label_smoothing_cross_entropy_loss_test.py

@@ -8,7 +8,7 @@
 import unittest
 
 import torch
-from classy_vision.losses import LabelSmoothingCrossEntropyLoss, build_loss
+from classy_vision.losses import build_loss, LabelSmoothingCrossEntropyLoss
 
 
 class TestLabelSmoothingCrossEntropyLoss(unittest.TestCase):

test/losses_multi_output_sum_loss_test.py

@@ -8,9 +8,9 @@
 
 import torch
 from classy_vision.losses import (
+    build_loss,
     ClassyLoss,
     MultiOutputSumLoss,
-    build_loss,
     register_loss,
 )
 

test/losses_soft_target_cross_entropy_loss_test.py

@@ -8,7 +8,7 @@
 import unittest
 
 import torch
-from classy_vision.losses import SoftTargetCrossEntropyLoss, build_loss
+from classy_vision.losses import build_loss, SoftTargetCrossEntropyLoss
 
 
 class TestSoftTargetCrossEntropyLoss(unittest.TestCase):

test/losses_sum_arbitrary_loss_test.py

@@ -8,7 +8,7 @@
 import unittest
 
 import torch
-from classy_vision.losses import ClassyLoss, SumArbitraryLoss, build_loss, register_loss
+from classy_vision.losses import build_loss, ClassyLoss, register_loss, SumArbitraryLoss
 
 
 @register_loss("mock_a")

test/manual/models_classy_vision_model_test.py

@@ -10,7 +10,7 @@
 
 import torch
 from classy_vision.heads import build_head
-from classy_vision.models import ClassyModel, build_model
+from classy_vision.models import build_model, ClassyModel
 from test.generic.config_utils import get_test_model_configs
 from test.generic.utils import compare_model_state
 

test/manual/tasks_classification_task_amp_test.py

@@ -8,7 +8,7 @@
 import unittest
 
 import torch
-from classy_vision.tasks import ClassificationTask, build_task
+from classy_vision.tasks import build_task, ClassificationTask
 from classy_vision.trainer import LocalTrainer
 from test.generic.config_utils import get_fast_test_task_config, get_test_task_config
 

test/models_classy_model_test.py

@@ -16,9 +16,9 @@
 from classy_vision.heads import FullyConnectedHead, IdentityHead
 from classy_vision.hooks import CheckpointHook
 from classy_vision.models import (
+    build_model,
     ClassyModel,
     ClassyModelWrapper,
-    build_model,
     register_model,
 )
 from classy_vision.models.classy_model import _ClassyModelAdapter