Skip to content

Commit f45d7d8

Browse files
NicolasHugfacebook-github-bot
authored andcommitted
Back out "[codemod][usort] apply import merging for fbcode/pytorch/vision/torchvision (1 of 1)"
Summary: Original commit changeset: 62e5f0101071 Original Phabricator Diff: D35552969 (Note: this ignores all push blocking failures!) Reviewed By: datumbox, jdsgomes Differential Revision: D35811608 fbshipit-source-id: 938ce9032ccca7a88bad762a4102016f8e71aef4
1 parent 7727634 commit f45d7d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+385
-550
lines changed

torchvision/models/detection/_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from typing import List, Tuple
44

55
import torch
6-
from torch import nn, Tensor
6+
from torch import Tensor, nn
77
from torchvision.ops.misc import FrozenBatchNorm2d
88

99

torchvision/models/detection/backbone_utils.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33

44
from torch import nn, Tensor
55
from torchvision.ops import misc as misc_nn_ops
6-
from torchvision.ops.feature_pyramid_network import (
7-
ExtraFPNBlock,
8-
FeaturePyramidNetwork,
9-
LastLevelMaxPool,
10-
)
6+
from torchvision.ops.feature_pyramid_network import ExtraFPNBlock, FeaturePyramidNetwork, LastLevelMaxPool
117

128
from .. import mobilenet, resnet
13-
from .._api import get_enum_from_fn, WeightsEnum
14-
from .._utils import handle_legacy_interface, IntermediateLayerGetter
9+
from .._api import WeightsEnum, get_enum_from_fn
10+
from .._utils import IntermediateLayerGetter, handle_legacy_interface
1511

1612

1713
class BackboneWithFPN(nn.Module):

torchvision/models/detection/faster_rcnn.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,18 @@
66
from torchvision.ops import MultiScaleRoIAlign
77

88
from ...ops import misc as misc_nn_ops
9-
from ...transforms._presets import InterpolationMode, ObjectDetection
10-
from .._api import Weights, WeightsEnum
9+
from ...transforms._presets import ObjectDetection, InterpolationMode
10+
from .._api import WeightsEnum, Weights
1111
from .._meta import _COCO_CATEGORIES
12-
from .._utils import _ovewrite_value_param, handle_legacy_interface
13-
from ..mobilenetv3 import mobilenet_v3_large, MobileNet_V3_Large_Weights
14-
from ..resnet import resnet50, ResNet50_Weights
12+
from .._utils import handle_legacy_interface, _ovewrite_value_param
13+
from ..mobilenetv3 import MobileNet_V3_Large_Weights, mobilenet_v3_large
14+
from ..resnet import ResNet50_Weights, resnet50
1515
from ._utils import overwrite_eps
1616
from .anchor_utils import AnchorGenerator
17-
from .backbone_utils import (
18-
_mobilenet_extractor,
19-
_resnet_fpn_extractor,
20-
_validate_trainable_layers,
21-
)
17+
from .backbone_utils import _resnet_fpn_extractor, _validate_trainable_layers, _mobilenet_extractor
2218
from .generalized_rcnn import GeneralizedRCNN
2319
from .roi_heads import RoIHeads
24-
from .rpn import RegionProposalNetwork, RPNHead
20+
from .rpn import RPNHead, RegionProposalNetwork
2521
from .transform import GeneralizedRCNNTransform
2622

2723

torchvision/models/detection/fcos.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
22
import warnings
33
from collections import OrderedDict
44
from functools import partial
5-
from typing import Any, Callable, Dict, List, Optional, Tuple
5+
from typing import Any, Callable, Dict, List, Tuple, Optional
66

77
import torch
88
from torch import nn, Tensor
99

10-
from ...ops import (
11-
boxes as box_ops,
12-
generalized_box_iou_loss,
13-
misc as misc_nn_ops,
14-
sigmoid_focal_loss,
15-
)
10+
from ...ops import sigmoid_focal_loss, generalized_box_iou_loss
11+
from ...ops import boxes as box_ops
12+
from ...ops import misc as misc_nn_ops
1613
from ...ops.feature_pyramid_network import LastLevelP6P7
17-
from ...transforms._presets import InterpolationMode, ObjectDetection
14+
from ...transforms._presets import ObjectDetection, InterpolationMode
1815
from ...utils import _log_api_usage_once
19-
from .._api import Weights, WeightsEnum
16+
from .._api import WeightsEnum, Weights
2017
from .._meta import _COCO_CATEGORIES
21-
from .._utils import _ovewrite_value_param, handle_legacy_interface
22-
from ..resnet import resnet50, ResNet50_Weights
18+
from .._utils import handle_legacy_interface, _ovewrite_value_param
19+
from ..resnet import ResNet50_Weights, resnet50
2320
from . import _utils as det_utils
2421
from .anchor_utils import AnchorGenerator
2522
from .backbone_utils import _resnet_fpn_extractor, _validate_trainable_layers

torchvision/models/detection/generalized_rcnn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import warnings
66
from collections import OrderedDict
7-
from typing import Dict, List, Optional, Tuple, Union
7+
from typing import Tuple, List, Dict, Optional, Union
88

99
import torch
1010
from torch import nn, Tensor

torchvision/models/detection/keypoint_rcnn.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from torchvision.ops import MultiScaleRoIAlign
66

77
from ...ops import misc as misc_nn_ops
8-
from ...transforms._presets import InterpolationMode, ObjectDetection
9-
from .._api import Weights, WeightsEnum
8+
from ...transforms._presets import ObjectDetection, InterpolationMode
9+
from .._api import WeightsEnum, Weights
1010
from .._meta import _COCO_PERSON_CATEGORIES, _COCO_PERSON_KEYPOINT_NAMES
11-
from .._utils import _ovewrite_value_param, handle_legacy_interface
12-
from ..resnet import resnet50, ResNet50_Weights
11+
from .._utils import handle_legacy_interface, _ovewrite_value_param
12+
from ..resnet import ResNet50_Weights, resnet50
1313
from ._utils import overwrite_eps
1414
from .backbone_utils import _resnet_fpn_extractor, _validate_trainable_layers
1515
from .faster_rcnn import FasterRCNN

torchvision/models/detection/mask_rcnn.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from torchvision.ops import MultiScaleRoIAlign
66

77
from ...ops import misc as misc_nn_ops
8-
from ...transforms._presets import InterpolationMode, ObjectDetection
9-
from .._api import Weights, WeightsEnum
8+
from ...transforms._presets import ObjectDetection, InterpolationMode
9+
from .._api import WeightsEnum, Weights
1010
from .._meta import _COCO_CATEGORIES
11-
from .._utils import _ovewrite_value_param, handle_legacy_interface
12-
from ..resnet import resnet50, ResNet50_Weights
11+
from .._utils import handle_legacy_interface, _ovewrite_value_param
12+
from ..resnet import ResNet50_Weights, resnet50
1313
from ._utils import overwrite_eps
1414
from .backbone_utils import _resnet_fpn_extractor, _validate_trainable_layers
1515
from .faster_rcnn import FasterRCNN

torchvision/models/detection/retinanet.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
import math
22
import warnings
33
from collections import OrderedDict
4-
from typing import Any, Dict, List, Optional, Tuple
4+
from typing import Any, Dict, List, Tuple, Optional
55

66
import torch
77
from torch import nn, Tensor
88

9-
from ...ops import boxes as box_ops, misc as misc_nn_ops, sigmoid_focal_loss
9+
from ...ops import sigmoid_focal_loss
10+
from ...ops import boxes as box_ops
11+
from ...ops import misc as misc_nn_ops
1012
from ...ops.feature_pyramid_network import LastLevelP6P7
11-
from ...transforms._presets import InterpolationMode, ObjectDetection
13+
from ...transforms._presets import ObjectDetection, InterpolationMode
1214
from ...utils import _log_api_usage_once
13-
from .._api import Weights, WeightsEnum
15+
from .._api import WeightsEnum, Weights
1416
from .._meta import _COCO_CATEGORIES
15-
from .._utils import _ovewrite_value_param, handle_legacy_interface
16-
from ..resnet import resnet50, ResNet50_Weights
17+
from .._utils import handle_legacy_interface, _ovewrite_value_param
18+
from ..resnet import ResNet50_Weights, resnet50
1719
from . import _utils as det_utils
1820
from ._utils import overwrite_eps
1921
from .anchor_utils import AnchorGenerator

torchvision/models/detection/roi_heads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Dict, List, Optional, Tuple
1+
from typing import Optional, List, Dict, Tuple
22

33
import torch
44
import torch.nn.functional as F

torchvision/models/detection/rpn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Dict, List, Optional, Tuple
1+
from typing import List, Optional, Dict, Tuple
22

33
import torch
44
from torch import nn, Tensor

0 commit comments

Comments
 (0)