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

fbshipit-source-id: a4efc688d02da80c6e96685aa8eb00411615a366

d2go/config/__init__.py

@@ -4,10 +4,10 @@
 
 # forward the namespace to avoid `d2go.config.config`
 from .config import (
+    auto_scale_world_size,
+    CfgNode,
     CONFIG_CUSTOM_PARSE_REGISTRY,
     CONFIG_SCALING_METHOD_REGISTRY,
-    CfgNode,
-    auto_scale_world_size,
     reroute_config_path,
     temp_defrost,
 )

d2go/data/build.py

@@ -5,7 +5,7 @@
 import itertools
 import logging
 import operator
-from collections import OrderedDict, defaultdict
+from collections import defaultdict, OrderedDict
 from typing import Dict
 
 import torch
@@ -19,7 +19,7 @@ from detectron2.data import (
     get_detection_dataset_dicts,
 )
 from detectron2.data.build import worker_init_reset_seed
-from detectron2.data.common import MapDataset, DatasetFromList
+from detectron2.data.common import DatasetFromList, MapDataset
 from detectron2.data.dataset_mapper import DatasetMapper
 from detectron2.data.samplers import RepeatFactorTrainingSampler
 from detectron2.utils.comm import get_world_size

d2go/data/dataset_mappers/__init__.py

@@ -2,6 +2,6 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 
-from .build import D2GO_DATA_MAPPER_REGISTRY, build_dataset_mapper  # noqa
+from .build import build_dataset_mapper, D2GO_DATA_MAPPER_REGISTRY  # noqa
 from .d2go_dataset_mapper import D2GoDatasetMapper  # noqa
 from .rotated_dataset_mapper import RotatedDatasetMapper  # noqa

d2go/data/dataset_mappers/d2go_dataset_mapper_impl.py

@@ -13,10 +13,7 @@ from d2go.data.dataset_mappers.data_reading import (
 )
 from d2go.utils.helper import retryable
 from detectron2.data import detection_utils as utils, transforms as T
-from detectron2.data.transforms.augmentation import (
-    AugInput,
-    AugmentationList,
-)
+from detectron2.data.transforms.augmentation import AugInput, AugmentationList
 
 logger = logging.getLogger(__name__)
 

d2go/data/extended_coco.py

@@ -7,7 +7,7 @@ import logging
 import shlex
 import subprocess
 from collections import defaultdict
-from typing import Optional, List, Dict
+from typing import Dict, List, Optional
 
 import detectron2.utils.comm as comm
 from detectron2.data import MetadataCatalog

d2go/data/extended_lvis.py

@@ -172,7 +172,7 @@ if __name__ == "__main__":
     """
     import sys
 
-    import detectron2.data.datasets  # noqa # add pre-defined metadata
+    import detectron2.data.datasets  # noqa  # add pre-defined metadata
     import numpy as np
     from detectron2.utils.logger import setup_logger
     from detectron2.utils.visualizer import Visualizer

d2go/data/keypoint_metadata_registry.py

 #!/usr/bin/env python3
 
-from typing import NamedTuple, List, Tuple
+from typing import List, NamedTuple, Tuple
 
 from detectron2.utils.registry import Registry
 

d2go/data/transforms/__init__.py

@@ -3,5 +3,12 @@
 
 
 # import all modules to make sure Registry works
-from . import affine, blur, box_utils, color_yuv, crop, d2_native  # noqa
-# @fb-only: from . import fb  # noqa 
+# @fb-only: from . import (  # noqa  # noqa 
+    affine,
+    blur,
+    box_utils,
+    color_yuv,
+    crop,
+    d2_native,
+    fb,
+)

d2go/data/transforms/affine.py

@@ -10,7 +10,7 @@ import cv2
 import numpy as np
 import torchvision.transforms as T
 from detectron2.config import CfgNode
-from detectron2.data.transforms import Transform, TransformGen, NoOpTransform
+from detectron2.data.transforms import NoOpTransform, Transform, TransformGen
 
 from .build import TRANSFORM_OP_REGISTRY
 

d2go/data/transforms/blur.py

 #!/usr/bin/env python3
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
-from typing import List, Tuple, Dict
+from typing import Dict, List, Tuple
 
 import detectron2.data.transforms.augmentation as aug
 import numpy as np
 from detectron2.config import CfgNode
 from detectron2.data.transforms import NoOpTransform, Transform
 
-from .build import TRANSFORM_OP_REGISTRY, _json_load
+from .build import _json_load, TRANSFORM_OP_REGISTRY
 
 
 class LocalizedBoxMotionBlurTransform(Transform):

d2go/data/transforms/box_utils.py

@@ -2,7 +2,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 import functools
-from typing import Tuple, List, Any, Union
+from typing import Any, List, Tuple, Union
 
 import detectron2.data.transforms.augmentation as aug
 import numpy as np
@@ -11,7 +11,7 @@ from detectron2.config import CfgNode
 from detectron2.data.transforms.transform import Transform
 from detectron2.structures.boxes import Boxes
 
-from .build import TRANSFORM_OP_REGISTRY, _json_load
+from .build import _json_load, TRANSFORM_OP_REGISTRY
 
 
 def get_box_union(boxes: Boxes):

d2go/data/transforms/build.py

@@ -4,7 +4,7 @@
 
 import json
 import logging
-from typing import List, Dict, Optional, Tuple
+from typing import Dict, List, Optional, Tuple
 
 from detectron2.config import CfgNode
 from detectron2.data import transforms as d2T

d2go/data/transforms/color_yuv.py

@@ -2,7 +2,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 
-from typing import List, Callable, Union
+from typing import Callable, List, Union
 
 import detectron2.data.transforms.augmentation as aug
 import numpy as np
@@ -11,7 +11,7 @@ from detectron2.data import detection_utils as du
 from detectron2.data.transforms.transform import Transform
 from fvcore.transforms.transform import BlendTransform
 
-from .build import TRANSFORM_OP_REGISTRY, _json_load
+from .build import _json_load, TRANSFORM_OP_REGISTRY
 
 
 class InvertibleColorTransform(Transform):

d2go/data/transforms/crop.py

@@ -3,7 +3,7 @@
 
 
 import math
-from typing import List, Optional, Tuple, Union, Any
+from typing import Any, List, Optional, Tuple, Union
 
 import detectron2.data.transforms.augmentation as aug
 import numpy as np
@@ -13,7 +13,7 @@ from detectron2.structures import BoxMode
 from fvcore.transforms.transform import CropTransform, NoOpTransform, Transform
 
 from . import box_utils as bu
-from .build import TRANSFORM_OP_REGISTRY, _json_load
+from .build import _json_load, TRANSFORM_OP_REGISTRY
 
 
 class CropBoundary(aug.Augmentation):

d2go/data/transforms/d2_native.py

@@ -3,14 +3,14 @@
 
 
 import logging
-from typing import List, Union, Optional
+from typing import List, Optional, Union
 
 import detectron2.data.transforms.augmentation as aug
 from detectron2.config import CfgNode
 from detectron2.data import transforms as d2T
 from detectron2.projects.point_rend import ColorAugSSDTransform
 
-from .build import TRANSFORM_OP_REGISTRY, _json_load
+from .build import _json_load, TRANSFORM_OP_REGISTRY
 
 logger = logging.getLogger(__name__)
 

d2go/data/transforms/tensor.py

@@ -2,11 +2,11 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 
-from typing import List, Optional, Union, Any
+from typing import Any, List, Optional, Union
 
 import numpy as np
 import torch
-from detectron2.data.transforms.augmentation import AugmentationList, Augmentation
+from detectron2.data.transforms.augmentation import Augmentation, AugmentationList
 from detectron2.structures import Boxes
 from fvcore.transforms.transform import Transform, TransformList
 

d2go/data/utils.py

@@ -17,10 +17,10 @@ import numpy as np
 import torch.utils.data as data
 from d2go.config import temp_defrost
 from d2go.data.datasets import (
-    register_dataset_split,
     ANN_FN,
     IM_DIR,
     INJECTED_COCO_DATASETS_LUT,
+    register_dataset_split,
 )
 from detectron2.data import DatasetCatalog, MetadataCatalog
 from detectron2.data.build import (

d2go/export/api.py

@@ -26,7 +26,7 @@ import logging
 import os
 import sys
 from abc import ABC, abstractmethod
-from typing import Callable, Dict, NamedTuple, Optional, Union, Tuple
+from typing import Callable, Dict, NamedTuple, Optional, Tuple, Union
 
 if sys.version_info >= (3, 8):
     from typing import final

d2go/export/torchscript.py

@@ -5,13 +5,13 @@
 import contextlib
 import logging
 import os
-from typing import Any, Tuple, Optional, Dict, NamedTuple, List, AnyStr, Set
+from typing import Any, AnyStr, Dict, List, NamedTuple, Optional, Set, Tuple
 
 import torch
-from d2go.export.api import ModelExportMethodRegistry, ModelExportMethod
+from d2go.export.api import ModelExportMethod, ModelExportMethodRegistry
 from detectron2.config.instantiate import dump_dataclass, instantiate
 from detectron2.export import dump_torchscript_IR
-from detectron2.export.flatten import TracingAdapter, flatten_to_tuple
+from detectron2.export.flatten import flatten_to_tuple, TracingAdapter
 from detectron2.export.torchscript_patch import patch_builtin_len
 from detectron2.utils.file_io import PathManager
 from mobile_cv.common.misc.file_utils import make_temp_directory

d2go/initializer.py

@@ -17,13 +17,8 @@ def _register_d2_datasets():
 
 def _register():
     from d2go.data import dataset_mappers  # NOQA
-    from d2go.data.datasets import (
-        register_json_datasets,
-        register_builtin_datasets,
-    )
-    from d2go.modeling.backbone import (  # NOQA
-        fbnet_v2,
-    )
+    from d2go.data.datasets import register_builtin_datasets, register_json_datasets
+    from d2go.modeling.backbone import fbnet_v2  # NOQA
 
     # register_json_datasets()
     # register_builtin_datasets()