[Fix] Correct isort setup (#288)

* isort

* remove tools from setup.cfg

demo/batch_image_demo.py

@@ -2,8 +2,8 @@ from argparse import ArgumentParser
 from pathlib import Path
 
 import mmcv
-
 from mmdet.apis import init_detector
+
 from mmocr.apis.inference import model_inference
 from mmocr.datasets import build_dataset  # noqa: F401
 from mmocr.models import build_detector  # noqa: F401

demo/image_demo.py

@@ -1,8 +1,8 @@
 from argparse import ArgumentParser
 
 import mmcv
-
 from mmdet.apis import init_detector
+
 from mmocr.apis.inference import model_inference
 from mmocr.datasets import build_dataset  # noqa: F401
 from mmocr.models import build_detector  # noqa: F401

demo/ner_demo.py

@@ -1,6 +1,7 @@
 from argparse import ArgumentParser
 
 from mmdet.apis import init_detector
+
 from mmocr.apis.inference import text_model_inference
 
 from mmocr.datasets import build_dataset  # NOQA

demo/ocr_image_demo.py

@@ -1,8 +1,8 @@
 from argparse import ArgumentParser
 
 import mmcv
-
 from mmdet.apis import init_detector
+
 from mmocr.apis.inference import model_inference
 from mmocr.core.visualize import det_recog_show_result
 from mmocr.datasets.pipelines.crop import crop_img

demo/webcam_demo.py

@@ -2,8 +2,8 @@ import argparse
 
 import cv2
 import torch
-
 from mmdet.apis import init_detector
+
 from mmocr.apis import model_inference
 from mmocr.datasets import build_dataset  # noqa: F401
 from mmocr.models import build_detector  # noqa: F401

mmocr/apis/inference.py

@@ -2,7 +2,6 @@ import numpy as np
 import torch
 from mmcv.ops import RoIPool
 from mmcv.parallel import collate, scatter
-
 from mmdet.datasets import replace_ImageToTensor
 from mmdet.datasets.pipelines import Compose
 

mmocr/apis/train.py

@@ -6,10 +6,10 @@ from mmcv.runner import (HOOKS, DistSamplerSeedHook, EpochBasedRunner,
                          Fp16OptimizerHook, OptimizerHook, build_optimizer,
                          build_runner)
 from mmcv.utils import build_from_cfg
-
 from mmdet.core import DistEvalHook, EvalHook
 from mmdet.datasets import (build_dataloader, build_dataset,
                             replace_ImageToTensor)
+
 from mmocr.utils import get_root_logger
 
 

mmocr/datasets/__init__.py

@@ -1,4 +1,5 @@
 from mmdet.datasets.builder import DATASETS, build_dataloader, build_dataset
+
 from . import utils
 from .base_dataset import BaseDataset
 from .icdar_dataset import IcdarDataset

mmocr/datasets/base_dataset.py

@@ -1,9 +1,9 @@
 import numpy as np
 from mmcv.utils import print_log
-from torch.utils.data import Dataset
-
 from mmdet.datasets.builder import DATASETS
 from mmdet.datasets.pipelines import Compose
+from torch.utils.data import Dataset
+
 from mmocr.datasets.builder import build_loader
 
 

mmocr/datasets/icdar_dataset.py

@@ -1,9 +1,9 @@
 import numpy as np
+from mmdet.datasets.builder import DATASETS
+from mmdet.datasets.coco import CocoDataset
 from pycocotools.coco import COCO
 
 import mmocr.utils as utils
-from mmdet.datasets.builder import DATASETS
-from mmdet.datasets.coco import CocoDataset
 from mmocr.core.evaluation.hmean import eval_hmean
 
 

mmocr/datasets/kie_dataset.py

@@ -3,8 +3,8 @@ from os import path as osp
 
 import numpy as np
 import torch
-
 from mmdet.datasets.builder import DATASETS
+
 from mmocr.core import compute_f1_score
 from mmocr.datasets.base_dataset import BaseDataset
 from mmocr.datasets.pipelines import sort_vertex8

mmocr/datasets/ner_dataset.py

@@ -1,4 +1,5 @@
 from mmdet.datasets.builder import DATASETS
+
 from mmocr.core.evaluation.ner_metric import eval_ner_f1
 from mmocr.datasets.base_dataset import BaseDataset
 

mmocr/datasets/ocr_dataset.py

@@ -1,4 +1,5 @@
 from mmdet.datasets.builder import DATASETS
+
 from mmocr.core.evaluation.ocr_metric import eval_ocr_metric
 from mmocr.datasets.base_dataset import BaseDataset
 

mmocr/datasets/ocr_seg_dataset.py

@@ -1,5 +1,6 @@
-import mmocr.utils as utils
 from mmdet.datasets.builder import DATASETS
+
+import mmocr.utils as utils
 from mmocr.datasets.ocr_dataset import OCRDataset
 
 

mmocr/datasets/pipelines/custom_format_bundle.py

@@ -1,8 +1,8 @@
 import numpy as np
 from mmcv.parallel import DataContainer as DC
-
 from mmdet.datasets.builder import PIPELINES
 from mmdet.datasets.pipelines.formating import DefaultFormatBundle
+
 from mmocr.core.visualize import overlay_mask_img, show_feature
 
 

mmocr/datasets/pipelines/dbnet_transforms.py

@@ -2,7 +2,6 @@ import imgaug
 import imgaug.augmenters as iaa
 import mmcv
 import numpy as np
-
 from mmdet.core.mask import PolygonMasks
 from mmdet.datasets.builder import PIPELINES
 

mmocr/datasets/pipelines/kie_transforms.py

@@ -1,7 +1,6 @@
 import numpy as np
 from mmcv import rescale_size
 from mmcv.parallel import DataContainer as DC
-
 from mmdet.datasets.builder import PIPELINES
 from mmdet.datasets.pipelines.formating import DefaultFormatBundle, to_tensor
 

mmocr/datasets/pipelines/loading.py

@@ -1,6 +1,5 @@
 import mmcv
 import numpy as np
-
 from mmdet.core import BitmapMasks, PolygonMasks
 from mmdet.datasets.builder import PIPELINES
 from mmdet.datasets.pipelines.loading import LoadAnnotations, LoadImageFromFile

mmocr/datasets/pipelines/ner_transforms.py

@@ -1,6 +1,6 @@
 import torch
-
 from mmdet.datasets.builder import PIPELINES
+
 from mmocr.models.builder import build_convertor
 
 

mmocr/datasets/pipelines/ocr_seg_targets.py

@@ -1,9 +1,9 @@
 import cv2
 import numpy as np
-
-import mmocr.utils.check_argument as check_argument
 from mmdet.core import BitmapMasks
 from mmdet.datasets.builder import PIPELINES
+
+import mmocr.utils.check_argument as check_argument
 from mmocr.models.builder import build_convertor
 
 

mmocr/datasets/pipelines/ocr_transforms.py

@@ -5,12 +5,12 @@ import numpy as np
 import torch
 import torchvision.transforms.functional as TF
 from mmcv.runner.dist_utils import get_dist_info
+from mmdet.datasets.builder import PIPELINES
 from PIL import Image
 from shapely.geometry import Polygon
 from shapely.geometry import box as shapely_box
 
 import mmocr.utils as utils
-from mmdet.datasets.builder import PIPELINES
 from mmocr.datasets.pipelines.crop import warp_img
 
 

mmocr/datasets/pipelines/test_time_aug.py

@@ -1,6 +1,5 @@
 import mmcv
 import numpy as np
-
 from mmdet.datasets.builder import PIPELINES
 from mmdet.datasets.pipelines.compose import Compose
 

mmocr/datasets/pipelines/textdet_targets/dbnet_targets.py

@@ -1,10 +1,10 @@
 import cv2
 import numpy as np
 import pyclipper
-from shapely.geometry import Polygon
-
 from mmdet.core import BitmapMasks
 from mmdet.datasets.builder import PIPELINES
+from shapely.geometry import Polygon
+
 from . import BaseTextDetTargets
 
 

mmocr/datasets/pipelines/textdet_targets/drrg_targets.py

@@ -1,11 +1,11 @@
 import cv2
 import numpy as np
 from lanms import merge_quadrangle_n9 as la_nms
+from mmdet.core import BitmapMasks
+from mmdet.datasets.builder import PIPELINES
 from numpy.linalg import norm
 
 import mmocr.utils.check_argument as check_argument
-from mmdet.core import BitmapMasks
-from mmdet.datasets.builder import PIPELINES
 from .textsnake_targets import TextSnakeTargets
 
 

mmocr/datasets/pipelines/textdet_targets/fcenet_targets.py

@@ -1,10 +1,10 @@
 import cv2
 import numpy as np
+from mmdet.datasets.builder import PIPELINES
 from numpy.fft import fft
 from numpy.linalg import norm
 
 import mmocr.utils.check_argument as check_argument
-from mmdet.datasets.builder import PIPELINES
 from .textsnake_targets import TextSnakeTargets
 
 

mmocr/datasets/pipelines/textdet_targets/panet_targets.py

@@ -1,5 +1,6 @@
 from mmdet.core import BitmapMasks
 from mmdet.datasets.builder import PIPELINES
+
 from . import BaseTextDetTargets
 
 

mmocr/datasets/pipelines/textdet_targets/psenet_targets.py

@@ -1,4 +1,5 @@
 from mmdet.datasets.builder import PIPELINES
+
 from . import PANetTargets
 
 

mmocr/datasets/pipelines/textdet_targets/textsnake_targets.py

@@ -1,10 +1,10 @@
 import cv2
 import numpy as np
+from mmdet.core import BitmapMasks
+from mmdet.datasets.builder import PIPELINES
 from numpy.linalg import norm
 
 import mmocr.utils.check_argument as check_argument
-from mmdet.core import BitmapMasks
-from mmdet.datasets.builder import PIPELINES
 from . import BaseTextDetTargets
 
 

mmocr/datasets/pipelines/transforms.py

@@ -5,12 +5,12 @@ import mmcv
 import numpy as np
 import Polygon as plg
 import torchvision.transforms as transforms
-from PIL import Image
-
-import mmocr.core.evaluation.utils as eval_utils
 from mmdet.core import BitmapMasks, PolygonMasks
 from mmdet.datasets.builder import PIPELINES
 from mmdet.datasets.pipelines.transforms import Resize
+from PIL import Image
+
+import mmocr.core.evaluation.utils as eval_utils
 from mmocr.utils import check_argument
 
 

mmocr/datasets/text_det_dataset.py

@@ -1,6 +1,6 @@
 import numpy as np
-
 from mmdet.datasets.builder import DATASETS
+
 from mmocr.core.evaluation.hmean import eval_hmean
 from mmocr.datasets.base_dataset import BaseDataset
 

mmocr/models/__init__.py

@@ -1,5 +1,6 @@
 from mmdet.models.builder import (BACKBONES, DETECTORS, HEADS, LOSSES, NECKS,
                                   build_backbone, build_detector, build_loss)
+
 from . import common, kie, textdet, textrecog
 from .builder import (CONVERTORS, DECODERS, ENCODERS, PREPROCESSOR,
                       build_convertor, build_decoder, build_encoder,

mmocr/models/common/backbones/unet.py

@@ -6,8 +6,8 @@ from mmcv.cnn import (UPSAMPLE_LAYERS, ConvModule, build_activation_layer,
                       kaiming_init)
 from mmcv.runner import load_checkpoint
 from mmcv.utils.parrots_wrapper import _BatchNorm
-
 from mmdet.models.builder import BACKBONES
+
 from mmocr.utils import get_root_logger
 
 

mmocr/models/common/losses/dice_loss.py

@@ -1,6 +1,5 @@
 import torch
 import torch.nn as nn
-
 from mmdet.models.builder import LOSSES
 
 

mmocr/models/kie/extractors/sdmgr.py

@@ -1,12 +1,12 @@
 import warnings
 
 import mmcv
-from torch import nn
-from torch.nn import functional as F
-
 from mmdet.core import bbox2roi
 from mmdet.models.builder import DETECTORS, build_roi_extractor
 from mmdet.models.detectors import SingleStageDetector
+from torch import nn
+from torch.nn import functional as F
+
 from mmocr.core import imshow_edge_node
 from mmocr.utils import list_from_file
 

mmocr/models/kie/heads/sdmgr_head.py

@@ -1,10 +1,9 @@
 import torch
 from mmcv.cnn import normal_init
+from mmdet.models.builder import HEADS, build_loss
 from torch import nn
 from torch.nn import functional as F
 
-from mmdet.models.builder import HEADS, build_loss
-
 
 @HEADS.register_module()
 class SDMGRHead(nn.Module):

mmocr/models/kie/losses/sdmgr_loss.py

@@ -1,8 +1,7 @@
 import torch
-from torch import nn
-
 from mmdet.models.builder import LOSSES
 from mmdet.models.losses import accuracy
+from torch import nn
 
 
 @LOSSES.register_module()

mmocr/models/ner/classifiers/ner_classifier.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS, build_loss
+
 from mmocr.models.builder import build_convertor, build_decoder, build_encoder
 from mmocr.models.textrecog.recognizer.base import BaseRecognizer
 

mmocr/models/ner/encoders/bert_encoder.py

@@ -1,8 +1,8 @@
 import torch.nn as nn
 from mmcv.cnn import uniform_init, xavier_init
 from mmcv.runner import load_checkpoint
-
 from mmdet.utils import get_root_logger
+
 from mmocr.models.builder import ENCODERS
 from mmocr.models.ner.utils.bert import BertModel
 

mmocr/models/ner/losses/masked_cross_entropy_loss.py

@@ -1,8 +1,7 @@
+from mmdet.models.builder import LOSSES
 from torch import nn
 from torch.nn import CrossEntropyLoss
 
-from mmdet.models.builder import LOSSES
-
 
 @LOSSES.register_module()
 class MaskedCrossEntropyLoss(nn.Module):

mmocr/models/ner/losses/masked_focal_loss.py

@@ -1,6 +1,6 @@
+from mmdet.models.builder import LOSSES
 from torch import nn
 
-from mmdet.models.builder import LOSSES
 from mmocr.models.common.losses.focal_loss import FocalLoss
 
 

mmocr/models/textdet/dense_heads/db_head.py

@@ -1,7 +1,7 @@
 import torch
 import torch.nn as nn
-
 from mmdet.models.builder import HEADS, build_loss
+
 from .head_mixin import HeadMixin
 
 

mmocr/models/textdet/dense_heads/drrg_head.py

@@ -3,8 +3,8 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.cnn import normal_init
-
 from mmdet.models.builder import HEADS, build_loss
+
 from mmocr.models.textdet.modules import GCN, LocalGraphs, ProposalLocalGraphs
 from mmocr.models.textdet.postprocess import decode
 from mmocr.utils import check_argument

mmocr/models/textdet/dense_heads/fce_head.py

@@ -1,8 +1,8 @@
 import torch.nn as nn
 from mmcv.cnn import normal_init
-
 from mmdet.core import multi_apply
 from mmdet.models.builder import HEADS, build_loss
+
 from mmocr.models.textdet.postprocess import decode
 from ..postprocess.wrapper import poly_nms
 from .head_mixin import HeadMixin

mmocr/models/textdet/dense_heads/head_mixin.py

@@ -1,6 +1,6 @@
 import numpy as np
-
 from mmdet.models.builder import HEADS
+
 from mmocr.models.textdet.postprocess import decode
 from mmocr.utils import check_argument
 

mmocr/models/textdet/dense_heads/pan_head.py

@@ -2,8 +2,8 @@ import numpy as np
 import torch
 import torch.nn as nn
 from mmcv.cnn import normal_init
-
 from mmdet.models.builder import HEADS, build_loss
+
 from mmocr.utils import check_argument
 from . import HeadMixin
 

mmocr/models/textdet/dense_heads/pse_head.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import HEADS
+
 from . import PANHead
 
 

mmocr/models/textdet/dense_heads/textsnake_head.py

@@ -1,7 +1,7 @@
 import torch.nn as nn
 from mmcv.cnn import normal_init
-
 from mmdet.models.builder import HEADS, build_loss
+
 from . import HeadMixin
 
 

mmocr/models/textdet/detectors/dbnet.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from mmocr.models.textdet.detectors.single_stage_text_detector import \
     SingleStageTextDetector
 from mmocr.models.textdet.detectors.text_detector_mixin import \

mmocr/models/textdet/detectors/drrg.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from mmocr.models.textdet.detectors.single_stage_text_detector import \
     SingleStageTextDetector
 from mmocr.models.textdet.detectors.text_detector_mixin import \

mmocr/models/textdet/detectors/fcenet.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from .single_stage_text_detector import SingleStageTextDetector
 from .text_detector_mixin import TextDetectorMixin
 

mmocr/models/textdet/detectors/ocr_mask_rcnn.py

@@ -1,5 +1,6 @@
 from mmdet.models.builder import DETECTORS
 from mmdet.models.detectors import MaskRCNN
+
 from mmocr.models.textdet.detectors.text_detector_mixin import \
     TextDetectorMixin
 

mmocr/models/textdet/detectors/panet.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from mmocr.models.textdet.detectors.single_stage_text_detector import \
     SingleStageTextDetector
 from mmocr.models.textdet.detectors.text_detector_mixin import \

mmocr/models/textdet/detectors/psenet.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from mmocr.models.textdet.detectors.single_stage_text_detector import \
     SingleStageTextDetector
 from mmocr.models.textdet.detectors.text_detector_mixin import \

mmocr/models/textdet/detectors/single_stage_text_detector.py

@@ -1,5 +1,4 @@
 import torch
-
 from mmdet.models.builder import DETECTORS
 from mmdet.models.detectors import SingleStageDetector
 

mmocr/models/textdet/detectors/textsnake.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from . import SingleStageTextDetector, TextDetectorMixin
 
 

mmocr/models/textdet/losses/db_loss.py

@@ -1,8 +1,8 @@
 import torch
 import torch.nn.functional as F
+from mmdet.models.builder import LOSSES
 from torch import nn
 
-from mmdet.models.builder import LOSSES
 from mmocr.models.common.losses.dice_loss import DiceLoss
 
 

mmocr/models/textdet/losses/drrg_loss.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn.functional as F
-from torch import nn
-
 from mmdet.core import BitmapMasks
 from mmdet.models.builder import LOSSES
+from torch import nn
+
 from mmocr.utils import check_argument
 
 

mmocr/models/textdet/losses/fce_loss.py

@@ -1,10 +1,9 @@
 import numpy as np
 import torch
 import torch.nn.functional as F
-from torch import nn
-
 from mmdet.core import multi_apply
 from mmdet.models.builder import LOSSES
+from torch import nn
 
 
 @LOSSES.register_module()

mmocr/models/textdet/losses/pan_loss.py

@@ -4,10 +4,10 @@ import warnings
 import numpy as np
 import torch
 import torch.nn.functional as F
-from torch import nn
-
 from mmdet.core import BitmapMasks
 from mmdet.models.builder import LOSSES
+from torch import nn
+
 from mmocr.utils import check_argument
 
 

mmocr/models/textdet/losses/pse_loss.py

@@ -1,5 +1,6 @@
 from mmdet.core import BitmapMasks
 from mmdet.models.builder import LOSSES
+
 from mmocr.utils import check_argument
 from . import PANLoss
 

mmocr/models/textdet/losses/textsnake_loss.py

@@ -1,9 +1,9 @@
 import torch
 import torch.nn.functional as F
-from torch import nn
-
 from mmdet.core import BitmapMasks
 from mmdet.models.builder import LOSSES
+from torch import nn
+
 from mmocr.utils import check_argument
 
 

mmocr/models/textdet/necks/fpem_ffm.py

@@ -1,8 +1,7 @@
 import torch.nn.functional as F
 from mmcv.cnn import xavier_init
-from torch import nn
-
 from mmdet.models.builder import NECKS
+from torch import nn
 
 
 class FPEM(nn.Module):

mmocr/models/textdet/necks/fpn_cat.py

@@ -3,7 +3,6 @@ import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.cnn import ConvModule
 from mmcv.runner import auto_fp16
-
 from mmdet.models.builder import NECKS
 
 

mmocr/models/textdet/necks/fpn_unet.py

@@ -1,9 +1,8 @@
 import torch
 import torch.nn.functional as F
 from mmcv.cnn import xavier_init
-from torch import nn
-
 from mmdet.models.builder import NECKS
+from torch import nn
 
 
 class UpBlock(nn.Module):

mmocr/models/textdet/necks/fpnf.py

@@ -2,9 +2,8 @@ import torch
 import torch.nn.functional as F
 from mmcv.cnn import ConvModule, xavier_init
 from mmcv.runner import auto_fp16
-from torch import nn
-
 from mmdet.models.builder import NECKS
+from torch import nn
 
 
 @NECKS.register_module()

mmocr/models/textrecog/backbones/nrtr_modality_transformer.py

@@ -1,6 +1,5 @@
 import torch.nn as nn
 from mmcv.cnn import kaiming_init, uniform_init
-
 from mmdet.models.builder import BACKBONES
 
 

mmocr/models/textrecog/backbones/resnet31_ocr.py

@@ -1,8 +1,8 @@
 import torch.nn as nn
 from mmcv.cnn import kaiming_init, uniform_init
+from mmdet.models.builder import BACKBONES
 
 import mmocr.utils as utils
-from mmdet.models.builder import BACKBONES
 from mmocr.models.textrecog.layers import BasicBlock
 
 

mmocr/models/textrecog/backbones/very_deep_vgg.py

@@ -1,6 +1,5 @@
 import torch.nn as nn
 from mmcv.cnn import uniform_init, xavier_init
-
 from mmdet.models.builder import BACKBONES
 
 

mmocr/models/textrecog/heads/seg_head.py

@@ -1,8 +1,7 @@
 import torch.nn.functional as F
 from mmcv.cnn import ConvModule
-from torch import nn
-
 from mmdet.models.builder import HEADS
+from torch import nn
 
 
 @HEADS.register_module()

mmocr/models/textrecog/losses/ce_loss.py

@@ -1,5 +1,4 @@
 import torch.nn as nn
-
 from mmdet.models.builder import LOSSES
 
 

mmocr/models/textrecog/losses/ctc_loss.py

@@ -2,7 +2,6 @@ import math
 
 import torch
 import torch.nn as nn
-
 from mmdet.models.builder import LOSSES
 
 

mmocr/models/textrecog/losses/seg_loss.py

@@ -1,7 +1,6 @@
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-
 from mmdet.models.builder import LOSSES
 
 

mmocr/models/textrecog/necks/fpn_ocr.py

@@ -2,7 +2,6 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.cnn import ConvModule
-
 from mmdet.models.builder import NECKS
 
 

mmocr/models/textrecog/recognizer/crnn.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from .encode_decode_recognizer import EncodeDecodeRecognizer
 
 

mmocr/models/textrecog/recognizer/encode_decode_recognizer.py

@@ -1,6 +1,6 @@
 import torch
-
 from mmdet.models.builder import DETECTORS, build_backbone, build_loss
+
 from mmocr.models.builder import (build_convertor, build_decoder,
                                   build_encoder, build_preprocessor)
 from .base import BaseRecognizer

mmocr/models/textrecog/recognizer/nrtr.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from .encode_decode_recognizer import EncodeDecodeRecognizer
 
 

mmocr/models/textrecog/recognizer/robust_scanner.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from .encode_decode_recognizer import EncodeDecodeRecognizer
 
 

mmocr/models/textrecog/recognizer/sar.py

@@ -1,4 +1,5 @@
 from mmdet.models.builder import DETECTORS
+
 from .encode_decode_recognizer import EncodeDecodeRecognizer
 
 

mmocr/models/textrecog/recognizer/seg_recognizer.py

@@ -1,5 +1,6 @@
 from mmdet.models.builder import (DETECTORS, build_backbone, build_head,
                                   build_loss, build_neck)
+
 from mmocr.models.builder import build_convertor, build_preprocessor
 from .base import BaseRecognizer
 

setup.cfg

@@ -19,8 +19,8 @@ SPLIT_PENALTY_AFTER_OPENING_BRACKET=800
 line_length = 79
 multi_line_output = 0
 known_standard_library = setuptools
-known_first_party = mmdet,mmocr
-known_third_party = PIL,Polygon,cv2,imgaug,lanms,lmdb,matplotlib,mmcv,numpy,pyclipper,pycocotools,pytest,rapidfuzz,scipy,shapely,skimage,titlecase,torch,torchvision
+known_first_party = mmocr
+known_third_party = PIL,Polygon,cv2,imgaug,lanms,lmdb,matplotlib,mmcv,mmdet,numpy,pyclipper,pycocotools,pytest,rapidfuzz,scipy,shapely,skimage,titlecase,torch,torchvision
 no_lines_before = STDLIB,LOCALFOLDER
 default_section = THIRDPARTY
 

tests/test_apis/test_model_inference.py

@@ -2,8 +2,8 @@ import os
 
 import pytest
 from mmcv.image import imread
-
 from mmdet.apis import init_detector
+
 from mmocr.apis.inference import model_inference
 from mmocr.datasets import build_dataset  # noqa: F401
 from mmocr.models import build_detector  # noqa: F401

tests/test_dataset/test_textdet_targets.py

@@ -1,10 +1,10 @@
 from unittest import mock
 
 import numpy as np
+from mmdet.core import PolygonMasks
 
 import mmocr.datasets.pipelines.custom_format_bundle as cf_bundle
 import mmocr.datasets.pipelines.textdet_targets as textdet_targets
-from mmdet.core import PolygonMasks
 
 
 @mock.patch('%s.cf_bundle.show_feature' % __name__)

tests/test_dataset/test_transforms.py

@@ -2,10 +2,10 @@ import unittest.mock as mock
 
 import numpy as np
 import torchvision.transforms as TF
+from mmdet.core import BitmapMasks, PolygonMasks
 from PIL import Image
 
 import mmocr.datasets.pipelines.transforms as transforms
-from mmdet.core import BitmapMasks, PolygonMasks
 
 
 @mock.patch('%s.transforms.np.random.random_sample' % __name__)

tests/test_models/test_loss.py

@@ -1,8 +1,8 @@
 import numpy as np
 import torch
+from mmdet.core import BitmapMasks
 
 import mmocr.models.textdet.losses as losses
-from mmdet.core import BitmapMasks
 
 
 def test_panloss():

tests/test_models/test_recognizer.py

@@ -5,8 +5,8 @@ from functools import partial
 import numpy as np
 import pytest
 import torch
-
 from mmdet.core import BitmapMasks
+
 from mmocr.models.textrecog.recognizer import (EncodeDecodeRecognizer,
                                                SegRecognizer)
 

tools/benchmark_processing.py

@@ -16,8 +16,8 @@ import argparse
 
 import mmcv
 from mmcv import Config
-
 from mmdet.datasets import build_dataloader
+
 from mmocr.datasets import build_dataset
 
 assert build_dataset is not None

tools/deployment/deploy_helper.py

@@ -4,8 +4,8 @@ from typing import Any, Iterable
 
 import numpy as np
 import torch
-
 from mmdet.models.builder import DETECTORS
+
 from mmocr.models.textdet.detectors.single_stage_text_detector import \
     SingleStageTextDetector
 from mmocr.models.textdet.detectors.text_detector_mixin import \

tools/deployment/onnx2tensorrt.py

@@ -9,13 +9,14 @@ import numpy as np
 import torch
 from mmcv.parallel import collate
 from mmcv.tensorrt import is_tensorrt_plugin_loaded, onnx2trt, save_trt_engine
+from mmdet.datasets import replace_ImageToTensor
+from mmdet.datasets.pipelines import Compose
 from tools.deployment.deploy_helper import (ONNXRuntimeDetector,
                                             ONNXRuntimeRecognizer,
                                             TensorRTDetector,
                                             TensorRTRecognizer)
 
-from mmdet.datasets import replace_ImageToTensor
-from mmdet.datasets.pipelines import Compose
+from mmocr.datasets.pipelines.crop import crop_img  # noqa: F401
 
 
 def get_GiB(x: int):
@@ -56,9 +57,9 @@ def _prepare_input_img(imgs, test_pipeline: Iterable[dict]):
     """Inference image(s) with the detector.
 
     Args:
-        model (nn.Module): The loaded detector.
         imgs (str/ndarray or list[str/ndarray] or tuple[str/ndarray]):
             Either image files or loaded images.
+        test_pipeline (Iterable[dict]): Test pipline of configuration.
     Returns:
         result (dict): Predicted results.
     """

tools/deployment/pytorch2onnx.py

@@ -6,13 +6,13 @@ import numpy as np
 import torch
 from mmcv.onnx import register_extra_symbolics
 from mmcv.parallel import collate
+from mmdet.apis import init_detector
+from mmdet.datasets import replace_ImageToTensor
+from mmdet.datasets.pipelines import Compose
 from tools.deployment.deploy_helper import (ONNXRuntimeDetector,
                                             ONNXRuntimeRecognizer)
 from torch import nn
 
-from mmdet.apis import init_detector
-from mmdet.datasets import replace_ImageToTensor
-from mmdet.datasets.pipelines import Compose
 from mmocr.datasets.pipelines.crop import crop_img  # noqa: F401
 
 
@@ -158,17 +158,16 @@ def pytorch2onnx(model: nn.Module,
             Default: `tmp.onnx`.
         verify (bool): Whether compare the outputs between Pytorch and ONNX.
             Default: False.
+        dynamic_export (bool): Whether apply dynamic export.
+            Default: False.
         device_id (id): Device id to place model and data.
             Default: 0
     """
     device = torch.device(type='cuda', index=device_id)
     model.to(device).eval()
     _convert_batchnorm(model)
-    # model.forward = model.simple_test
-    end2end_res = {'filename': img_path}
-    end2end_res['result'] = []
 
-    # mm_inputs = _demo_mm_inputs([1,3,512,512], 20)
+    # prepare inputs
     mm_inputs = _prepare_data(cfg=model.cfg, imgs=img_path)
     imgs = mm_inputs.pop('img')
     img_metas = mm_inputs.pop('img_metas')

tools/det_test_imgs.py

@@ -4,8 +4,8 @@ from argparse import ArgumentParser
 
 import mmcv
 from mmcv.utils import ProgressBar
-
 from mmdet.apis import inference_detector, init_detector
+
 from mmocr.models import build_detector  # noqa: F401
 from mmocr.utils import list_from_file, list_to_file
 

tools/recog_test_imgs.py

@@ -7,8 +7,8 @@ from itertools import compress
 
 import mmcv
 from mmcv.utils import ProgressBar
-
 from mmdet.apis import init_detector
+
 from mmocr.apis import model_inference
 from mmocr.core.evaluation.ocr_metric import eval_ocr_metric
 from mmocr.datasets import build_dataset  # noqa: F401

tools/test.py

@@ -10,9 +10,9 @@ from mmcv.cnn import fuse_conv_bn
 from mmcv.parallel import MMDataParallel, MMDistributedDataParallel
 from mmcv.runner import (get_dist_info, init_dist, load_checkpoint,
                          wrap_fp16_model)
-
 from mmdet.apis import multi_gpu_test, single_gpu_test
 from mmdet.datasets import replace_ImageToTensor
+
 from mmocr.datasets import build_dataloader, build_dataset
 from mmocr.models import build_detector