diff --git a/mmdeploy/codebase/mmcls/__init__.py b/mmdeploy/codebase/mmcls/__init__.py index 0683b42a3..981842f22 100644 --- a/mmdeploy/codebase/mmcls/__init__.py +++ b/mmdeploy/codebase/mmcls/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. +from . import models # noqa: F401,F403 from .deploy import * # noqa: F401,F403 -from .models import * # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmcls/models/__init__.py b/mmdeploy/codebase/mmcls/models/__init__.py index b4a1292b4..0e1058304 100644 --- a/mmdeploy/codebase/mmcls/models/__init__.py +++ b/mmdeploy/codebase/mmcls/models/__init__.py @@ -1,6 +1,6 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .backbones import * # noqa: F401,F403 -from .classifiers import * # noqa: F401,F403 -from .heads import * # noqa: F401,F403 -from .necks import * # noqa: F401,F403 -from .utils import * # noqa: F401,F403 +from . import backbones # noqa: F401,F403 +from . import classifiers # noqa: F401,F403 +from . import heads # noqa: F401,F403 +from . import necks # noqa: F401,F403 +from . import utils # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmcls/models/backbones/__init__.py b/mmdeploy/codebase/mmcls/models/backbones/__init__.py index fd9d7d3d4..62d47810c 100644 --- a/mmdeploy/codebase/mmcls/models/backbones/__init__.py +++ b/mmdeploy/codebase/mmcls/models/backbones/__init__.py @@ -1,8 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .shufflenet_v2 import shufflenetv2_backbone__forward__default -from .vision_transformer import visiontransformer__forward__ncnn - -__all__ = [ - 'shufflenetv2_backbone__forward__default', - 'visiontransformer__forward__ncnn' -] +from . import shufflenet_v2 # noqa: F401,F403 +from . import vision_transformer # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmcls/models/classifiers/__init__.py b/mmdeploy/codebase/mmcls/models/classifiers/__init__.py index 630dd251b..94502952b 100644 --- a/mmdeploy/codebase/mmcls/models/classifiers/__init__.py +++ b/mmdeploy/codebase/mmcls/models/classifiers/__init__.py @@ -1,4 +1,2 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .base import base_classifier__forward - -__all__ = ['base_classifier__forward'] +from . import base # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmcls/models/heads/__init__.py b/mmdeploy/codebase/mmcls/models/heads/__init__.py index 33441de00..86975066d 100644 --- a/mmdeploy/codebase/mmcls/models/heads/__init__.py +++ b/mmdeploy/codebase/mmcls/models/heads/__init__.py @@ -1,5 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .cls_head import cls_head__post_process -from .multi_label_head import multi_label_cls_head__post_process - -__all__ = ['cls_head__post_process', 'multi_label_cls_head__post_process'] +from . import cls_head # noqa: F401,F403 +from . import multi_label_head # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmcls/models/necks/__init__.py b/mmdeploy/codebase/mmcls/models/necks/__init__.py index 5bdebc563..882128e61 100644 --- a/mmdeploy/codebase/mmcls/models/necks/__init__.py +++ b/mmdeploy/codebase/mmcls/models/necks/__init__.py @@ -1,5 +1,2 @@ # Copyright (c) OpenMMLab. All rights reserved. - -from .gap import gap__forward - -__all__ = ['gap__forward'] +from . import gap # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmcls/models/utils/__init__.py b/mmdeploy/codebase/mmcls/models/utils/__init__.py index 3d0a17994..2e003bba7 100644 --- a/mmdeploy/codebase/mmcls/models/utils/__init__.py +++ b/mmdeploy/codebase/mmcls/models/utils/__init__.py @@ -1,10 +1,2 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .attention import (multiheadattention__forward__ncnn, - shift_window_msa__forward__default, - shift_window_msa__get_attn_mask__default) - -__all__ = [ - 'multiheadattention__forward__ncnn', - 'shift_window_msa__get_attn_mask__default', - 'shift_window_msa__forward__default' -] +from . import attention # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmdet/__init__.py b/mmdeploy/codebase/mmdet/__init__.py index 13ebd47e2..27a2ea680 100644 --- a/mmdeploy/codebase/mmdet/__init__.py +++ b/mmdeploy/codebase/mmdet/__init__.py @@ -1,9 +1,9 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .core import * # noqa: F401,F403 +from . import core # noqa: F401,F403 +from . import models # noqa: F401,F403 from .deploy import (MMDetection, ObjectDetection, clip_bboxes, gather_topk, get_post_processing_params, pad_with_value, pad_with_value_if_necessary) -from .models import * # noqa: F401,F403 __all__ = [ 'get_post_processing_params', 'clip_bboxes', 'pad_with_value', diff --git a/mmdeploy/codebase/mmdet/core/__init__.py b/mmdeploy/codebase/mmdet/core/__init__.py index ccf057bf7..184f934de 100644 --- a/mmdeploy/codebase/mmdet/core/__init__.py +++ b/mmdeploy/codebase/mmdet/core/__init__.py @@ -1,6 +1,6 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .anchor import * # noqa: F401,F403 -from .bbox import * # noqa: F401,F403 -from .ops import * # noqa: F401,F403 -from .point_generator import * # noqa: F401,F403 -from .post_processing import * # noqa: F401,F403 +from . import anchor # noqa: F401,F403 +from . import bbox # noqa: F401,F403 +from . import ops # noqa: F401,F403 +from . import point_generator # noqa: F401,F403 +from . import post_processing # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmdet/core/bbox/__init__.py b/mmdeploy/codebase/mmdet/core/bbox/__init__.py index 79b4917a0..7f2f692df 100644 --- a/mmdeploy/codebase/mmdet/core/bbox/__init__.py +++ b/mmdeploy/codebase/mmdet/core/bbox/__init__.py @@ -1,5 +1,5 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .delta_xywh_bbox_coder import * # noqa: F401,F403 -from .distance_point_bbox_coder import * # noqa: F401,F403 -from .tblr_bbox_coder import * # noqa: F401,F403 -from .transforms import * # noqa: F401,F403 +from . import delta_xywh_bbox_coder # noqa: F401,F403 +from . import distance_point_bbox_coder # noqa: F401,F403 +from . import tblr_bbox_coder # noqa: F401,F403 +from . import transforms # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmdet/core/ops/__init__.py b/mmdeploy/codebase/mmdet/core/ops/__init__.py index 93423d88d..0061beb36 100644 --- a/mmdeploy/codebase/mmdet/core/ops/__init__.py +++ b/mmdeploy/codebase/mmdet/core/ops/__init__.py @@ -1,5 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .detection_output import ncnn_detection_output_forward -from .prior_box import ncnn_prior_box_forward - -__all__ = ['ncnn_detection_output_forward', 'ncnn_prior_box_forward'] +from . import detection_output # noqa: F401,F403 +from . import prior_box # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmdet/core/post_processing/__init__.py b/mmdeploy/codebase/mmdet/core/post_processing/__init__.py index b62cf581d..5d18f72f9 100644 --- a/mmdeploy/codebase/mmdet/core/post_processing/__init__.py +++ b/mmdeploy/codebase/mmdet/core/post_processing/__init__.py @@ -1,4 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .bbox_nms import _multiclass_nms, multiclass_nms +from .bbox_nms import multiclass_nms -__all__ = ['multiclass_nms', '_multiclass_nms'] +__all__ = ['multiclass_nms'] diff --git a/mmdeploy/codebase/mmdet/core/post_processing/bbox_nms.py b/mmdeploy/codebase/mmdet/core/post_processing/bbox_nms.py index 71d8cf300..d62c48680 100644 --- a/mmdeploy/codebase/mmdet/core/post_processing/bbox_nms.py +++ b/mmdeploy/codebase/mmdet/core/post_processing/bbox_nms.py @@ -2,9 +2,8 @@ import torch from torch import Tensor -import mmdeploy from mmdeploy.core import FUNCTION_REWRITER, mark -from mmdeploy.mmcv.ops import ONNXNMSop, TRTBatchedNMSop +from mmdeploy.mmcv.ops.nms import ONNXNMSop, TRTBatchedNMSop from mmdeploy.utils import IR, is_dynamic_batch from mmdeploy.utils.constants import Backend @@ -166,7 +165,8 @@ def _multiclass_nms_single(boxes: Tensor, @FUNCTION_REWRITER.register_rewriter( - func_name='mmdeploy.codebase.mmdet.core.post_processing._multiclass_nms') + func_name='mmdeploy.codebase.mmdet.core.post_processing' + '.bbox_nms._multiclass_nms') def multiclass_nms__default(ctx, boxes: Tensor, scores: Tensor, @@ -223,7 +223,8 @@ def multiclass_nms__default(ctx, @FUNCTION_REWRITER.register_rewriter( - func_name='mmdeploy.codebase.mmdet.core.post_processing._multiclass_nms', + func_name='mmdeploy.codebase.mmdet.core.post_processing' + '.bbox_nms._multiclass_nms', backend='tensorrt') def multiclass_nms_static(ctx, boxes: Tensor, @@ -274,12 +275,12 @@ def multiclass_nms_static(ctx, @mark('multiclass_nms', inputs=['boxes', 'scores'], outputs=['dets', 'labels']) def multiclass_nms(*args, **kwargs): """Wrapper function for `_multiclass_nms`.""" - return mmdeploy.codebase.mmdet.core.post_processing._multiclass_nms( - *args, **kwargs) + return _multiclass_nms(*args, **kwargs) @FUNCTION_REWRITER.register_rewriter( - func_name='mmdeploy.codebase.mmdet.core.post_processing._multiclass_nms', + func_name='mmdeploy.codebase.mmdet.core.post_processing' + '.bbox_nms._multiclass_nms', backend=Backend.COREML.value) def multiclass_nms__coreml(ctx, boxes: Tensor, @@ -340,7 +341,8 @@ def multiclass_nms__coreml(ctx, @FUNCTION_REWRITER.register_rewriter( - func_name='mmdeploy.codebase.mmdet.core.post_processing._multiclass_nms', + func_name='mmdeploy.codebase.mmdet.core.post_processing' + '.bbox_nms._multiclass_nms', ir=IR.TORCHSCRIPT) def multiclass_nms__torchscript(ctx, boxes: Tensor, @@ -441,7 +443,8 @@ class AscendBatchNMSOp(torch.autograd.Function): @FUNCTION_REWRITER.register_rewriter( - func_name='mmdeploy.codebase.mmdet.core.post_processing._multiclass_nms', + func_name='mmdeploy.codebase.mmdet.core.post_processing' + '.bbox_nms._multiclass_nms', backend='ascend') def multiclass_nms__ascend(ctx, boxes: Tensor, diff --git a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py index d55331574..b87c31d79 100644 --- a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py +++ b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py @@ -13,7 +13,8 @@ from mmdet.models import BaseDetector from mmdeploy.backend.base import get_backend_file_count from mmdeploy.codebase.base import BaseBackendModel -from mmdeploy.codebase.mmdet import get_post_processing_params, multiclass_nms +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.utils import (Backend, get_backend, get_codebase_config, get_partition_config, load_config) diff --git a/mmdeploy/codebase/mmdet/models/__init__.py b/mmdeploy/codebase/mmdet/models/__init__.py index f67fee3e4..95aa46346 100644 --- a/mmdeploy/codebase/mmdet/models/__init__.py +++ b/mmdeploy/codebase/mmdet/models/__init__.py @@ -1,7 +1,7 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .backbones import * # noqa: F401, F403 -from .dense_heads import * # noqa: F401,F403 -from .detectors import * # noqa: F401,F403 -from .necks import * # noqa: F401,F403 -from .roi_heads import * # noqa: F401,F403 -from .transformer import * # noqa: F401,F403 +from . import backbones # noqa: F401, F403 +from . import dense_heads # noqa: F401,F403 +from . import detectors # noqa: F401,F403 +from . import necks # noqa: F401,F403 +from . import roi_heads # noqa: F401,F403 +from . import transformer # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/__init__.py b/mmdeploy/codebase/mmdet/models/dense_heads/__init__.py index b5fd30b10..3be3d072f 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/__init__.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/__init__.py @@ -1,20 +1,10 @@ # Copyright (c) OpenMMLab. All rights reserved. -from . import detr_head -from .base_dense_head import (base_dense_head__get_bbox, - base_dense_head__get_bboxes__ncnn) -from .fovea_head import fovea_head__get_bboxes -from .gfl_head import gfl_head__get_bbox -from .reppoints_head import reppoints_head__get_bboxes -from .rpn_head import rpn_head__get_bboxes, rpn_head__get_bboxes__ncnn -from .ssd_head import ssd_head__get_bboxes__ncnn -from .yolo_head import yolov3_head__get_bboxes, yolov3_head__get_bboxes__ncnn -from .yolox_head import yolox_head__get_bboxes, yolox_head__get_bboxes__ncnn - -__all__ = [ - 'rpn_head__get_bboxes', 'rpn_head__get_bboxes__ncnn', - 'yolov3_head__get_bboxes', 'yolov3_head__get_bboxes__ncnn', - 'yolox_head__get_bboxes', 'base_dense_head__get_bbox', - 'fovea_head__get_bboxes', 'base_dense_head__get_bboxes__ncnn', - 'ssd_head__get_bboxes__ncnn', 'yolox_head__get_bboxes__ncnn', - 'gfl_head__get_bbox', 'reppoints_head__get_bboxes', 'detr_head' -] +from . import base_dense_head # noqa: F401, F403 +from . import detr_head # noqa: F401, F403 +from . import fovea_head # noqa: F401, F403 +from . import gfl_head # noqa: F401, F403 +from . import reppoints_head # noqa: F401, F403 +from . import rpn_head # noqa: F401, F403 +from . import ssd_head # noqa: F401, F403 +from . import yolo_head # noqa: F401, F403 +from . import yolox_head # noqa: F401, F403 diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/base_dense_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/base_dense_head.py index 5f3bb5d51..52ec8da2c 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/base_dense_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/base_dense_head.py @@ -5,10 +5,12 @@ from mmdet.core.bbox.coder import (DeltaXYWHBBoxCoder, DistancePointBBoxCoder, from mmdet.core.bbox.transforms import distance2bbox from mmdet.models.dense_heads import PAAHead -from mmdeploy.codebase.mmdet import (gather_topk, get_post_processing_params, - multiclass_nms, - pad_with_value_if_necessary) -from mmdeploy.codebase.mmdet.core.ops import ncnn_detection_output_forward +from mmdeploy.codebase.mmdet.core.ops.detection_output import \ + ncnn_detection_output_forward +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import (gather_topk, + get_post_processing_params, + pad_with_value_if_necessary) from mmdeploy.core import FUNCTION_REWRITER from mmdeploy.utils import Backend, is_dynamic_shape diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/fovea_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/fovea_head.py index 475dd30fa..c4bf79498 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/fovea_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/fovea_head.py @@ -1,7 +1,8 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.codebase.mmdet import get_post_processing_params, multiclass_nms +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.core import FUNCTION_REWRITER diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/gfl_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/gfl_head.py index 801c13eb6..0e140952f 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/gfl_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/gfl_head.py @@ -2,8 +2,10 @@ import torch import torch.nn.functional as F -from mmdeploy.codebase.mmdet import (gather_topk, get_post_processing_params, - multiclass_nms, pad_with_value) +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import (gather_topk, + get_post_processing_params, + pad_with_value) from mmdeploy.core import FUNCTION_REWRITER from mmdeploy.utils import Backend, get_backend, is_dynamic_shape diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/reppoints_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/reppoints_head.py index 6074bf689..5f542f1d6 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/reppoints_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/reppoints_head.py @@ -3,9 +3,10 @@ from typing import Sequence import torch -from mmdeploy.codebase.mmdet import (gather_topk, get_post_processing_params, - multiclass_nms, - pad_with_value_if_necessary) +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import (gather_topk, + get_post_processing_params, + pad_with_value_if_necessary) from mmdeploy.core import FUNCTION_REWRITER from mmdeploy.utils import is_dynamic_shape diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/rpn_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/rpn_head.py index 2652d889b..f1c871437 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/rpn_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/rpn_head.py @@ -1,9 +1,10 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.codebase.mmdet import (gather_topk, get_post_processing_params, - multiclass_nms, - pad_with_value_if_necessary) +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import (gather_topk, + get_post_processing_params, + pad_with_value_if_necessary) from mmdeploy.core import FUNCTION_REWRITER from mmdeploy.utils import Backend, is_dynamic_shape diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/ssd_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/ssd_head.py index a9efda07a..a4c163073 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/ssd_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/ssd_head.py @@ -1,9 +1,10 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.codebase.mmdet import get_post_processing_params -from mmdeploy.codebase.mmdet.core.ops import (ncnn_detection_output_forward, - ncnn_prior_box_forward) +from mmdeploy.codebase.mmdet.core.ops.detection_output import \ + ncnn_detection_output_forward +from mmdeploy.codebase.mmdet.core.ops.prior_box import ncnn_prior_box_forward +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.core import FUNCTION_REWRITER from mmdeploy.utils import is_dynamic_shape diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/yolo_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/yolo_head.py index 2a00966eb..90e7b637e 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/yolo_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/yolo_head.py @@ -2,9 +2,9 @@ import numpy as np import torch -from mmdeploy.codebase.mmdet import (get_post_processing_params, - multiclass_nms, - pad_with_value_if_necessary) +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import (get_post_processing_params, + pad_with_value_if_necessary) from mmdeploy.core import FUNCTION_REWRITER, mark from mmdeploy.utils import Backend, is_dynamic_shape diff --git a/mmdeploy/codebase/mmdet/models/dense_heads/yolox_head.py b/mmdeploy/codebase/mmdet/models/dense_heads/yolox_head.py index d624c5a7c..7ca2e2c99 100644 --- a/mmdeploy/codebase/mmdet/models/dense_heads/yolox_head.py +++ b/mmdeploy/codebase/mmdet/models/dense_heads/yolox_head.py @@ -1,7 +1,8 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.codebase.mmdet import get_post_processing_params, multiclass_nms +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.core import FUNCTION_REWRITER, mark @@ -145,7 +146,8 @@ def yolox_head__get_bboxes__ncnn(ctx, Returns: output__ncnn (Tensor): outputs, shape is [N, num_det, 6]. """ - from mmdeploy.codebase.mmdet.core.ops import ncnn_detection_output_forward + from mmdeploy.codebase.mmdet.core.ops.detection_output import \ + ncnn_detection_output_forward from mmdeploy.utils import get_root_logger from mmdeploy.utils.config_utils import is_dynamic_shape dynamic_flag = is_dynamic_shape(ctx.cfg) diff --git a/mmdeploy/codebase/mmdet/models/detectors/__init__.py b/mmdeploy/codebase/mmdet/models/detectors/__init__.py index 147013e6f..21f0b4731 100644 --- a/mmdeploy/codebase/mmdet/models/detectors/__init__.py +++ b/mmdeploy/codebase/mmdet/models/detectors/__init__.py @@ -1,12 +1,5 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .base import base_detector__forward -from .rpn import rpn__simple_test -from .single_stage import single_stage_detector__simple_test -from .two_stage import (two_stage_detector__extract_feat, - two_stage_detector__simple_test) - -__all__ = [ - 'base_detector__forward', 'rpn__simple_test', - 'single_stage_detector__simple_test', 'two_stage_detector__extract_feat', - 'two_stage_detector__simple_test' -] +from . import base # noqa: F401, F403 +from . import rpn # noqa: F401, F403 +from . import single_stage # noqa: F401, F403 +from . import two_stage # noqa: F401, F403 diff --git a/mmdeploy/codebase/mmdet/models/roi_heads/__init__.py b/mmdeploy/codebase/mmdet/models/roi_heads/__init__.py index d40c39a3d..53afa49c1 100644 --- a/mmdeploy/codebase/mmdet/models/roi_heads/__init__.py +++ b/mmdeploy/codebase/mmdet/models/roi_heads/__init__.py @@ -1,23 +1,7 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .bbox_head import bbox_head__forward, bbox_head__get_bboxes -from .cascade_roi_head import cascade_roi_head__simple_test -from .fcn_mask_head import fcn_mask_head__get_seg_masks -from .single_level_roi_extractor import ( - single_roi_extractor__forward, single_roi_extractor__forward__openvino, - single_roi_extractor__forward__tensorrt) -from .standard_roi_head import standard_roi_head__simple_test -from .test_mixins import (bbox_test_mixin__simple_test_bboxes, - mask_test_mixin__simple_test_mask) - -__all__ = [ - 'bbox_head__get_bboxes', - 'bbox_head__forward', - 'cascade_roi_head__simple_test', - 'fcn_mask_head__get_seg_masks', - 'single_roi_extractor__forward', - 'single_roi_extractor__forward__openvino', - 'single_roi_extractor__forward__tensorrt', - 'standard_roi_head__simple_test', - 'bbox_test_mixin__simple_test_bboxes', - 'mask_test_mixin__simple_test_mask', -] +from . import bbox_head # noqa: F401, F403 +from . import cascade_roi_head # noqa: F401, F403 +from . import fcn_mask_head # noqa: F401, F403 +from . import single_level_roi_extractor # noqa: F401, F403 +from . import standard_roi_head # noqa: F401, F403 +from . import test_mixins # noqa: F401, F403 diff --git a/mmdeploy/codebase/mmdet/models/roi_heads/bbox_head.py b/mmdeploy/codebase/mmdet/models/roi_heads/bbox_head.py index 9f596d340..5edfee189 100644 --- a/mmdeploy/codebase/mmdet/models/roi_heads/bbox_head.py +++ b/mmdeploy/codebase/mmdet/models/roi_heads/bbox_head.py @@ -2,7 +2,8 @@ import torch import torch.nn.functional as F -from mmdeploy.codebase.mmdet import get_post_processing_params, multiclass_nms +from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.core import FUNCTION_REWRITER, mark diff --git a/mmdeploy/codebase/mmdet/models/roi_heads/fcn_mask_head.py b/mmdeploy/codebase/mmdet/models/roi_heads/fcn_mask_head.py index 0adb78c49..76a9cc9b6 100644 --- a/mmdeploy/codebase/mmdet/models/roi_heads/fcn_mask_head.py +++ b/mmdeploy/codebase/mmdet/models/roi_heads/fcn_mask_head.py @@ -2,7 +2,7 @@ import torch import torch.nn.functional as F -from mmdeploy.codebase.mmdet import get_post_processing_params +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.core import FUNCTION_REWRITER from mmdeploy.utils import Backend, get_backend diff --git a/mmdeploy/codebase/mmdet/models/roi_heads/test_mixins.py b/mmdeploy/codebase/mmdet/models/roi_heads/test_mixins.py index e21b2acd3..e694a6a23 100644 --- a/mmdeploy/codebase/mmdet/models/roi_heads/test_mixins.py +++ b/mmdeploy/codebase/mmdet/models/roi_heads/test_mixins.py @@ -93,10 +93,11 @@ def mask_test_mixin__simple_test_mask(ctx, self, x, img_metas, det_bboxes, """ batch_size = det_bboxes.size(0) det_bboxes = det_bboxes[..., :4] + # expand might lead to static shape, use broadcast instead batch_index = torch.arange( - det_bboxes.size(0), - device=det_bboxes.device).float().view(-1, 1, 1).expand( - det_bboxes.size(0), det_bboxes.size(1), 1) + det_bboxes.size(0), device=det_bboxes.device).float().view( + -1, 1) + det_bboxes.new_zeros( + (det_bboxes.size(0), det_bboxes.size(1))).unsqueeze(-1) mask_rois = torch.cat([batch_index, det_bboxes], dim=-1) mask_rois = mask_rois.view(-1, 5) mask_results = self._mask_forward(x, mask_rois) diff --git a/mmdeploy/codebase/mmdet3d/__init__.py b/mmdeploy/codebase/mmdet3d/__init__.py index d9b482f36..b4c4c7f3a 100644 --- a/mmdeploy/codebase/mmdet3d/__init__.py +++ b/mmdeploy/codebase/mmdet3d/__init__.py @@ -1,6 +1,6 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .core import * # noqa: F401,F403 +from . import core # noqa: F401,F403 +from . import models # noqa: F401,F403 from .deploy import MMDetection3d, MonocularDetection, VoxelDetection -from .models import * # noqa: F401,F403 __all__ = ['MMDetection3d', 'MonocularDetection', 'VoxelDetection'] diff --git a/mmdeploy/codebase/mmdet3d/core/__init__.py b/mmdeploy/codebase/mmdet3d/core/__init__.py index 7c0065f72..0908a50ea 100644 --- a/mmdeploy/codebase/mmdet3d/core/__init__.py +++ b/mmdeploy/codebase/mmdet3d/core/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .bbox import * # noqa: F401,F403 -from .post_processing import * # noqa: F401,F403 +from . import bbox # noqa: F401,F403 +from . import post_processing # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmdet3d/core/bbox/__init__.py b/mmdeploy/codebase/mmdet3d/core/bbox/__init__.py index bdf3cc4a2..8d9d69136 100644 --- a/mmdeploy/codebase/mmdet3d/core/bbox/__init__.py +++ b/mmdeploy/codebase/mmdet3d/core/bbox/__init__.py @@ -1,3 +1,5 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .fcos3d_bbox_coder import * # noqa: F401,F403 -from .utils import * # noqa: F401,F403 +from . import fcos3d_bbox_coder # noqa: F401,F403 +from .utils import points_img2cam + +__all__ = ['points_img2cam'] diff --git a/mmdeploy/codebase/mmdet3d/core/bbox/utils.py b/mmdeploy/codebase/mmdet3d/core/bbox/utils.py index 5e42edf0c..8626a18e6 100644 --- a/mmdeploy/codebase/mmdet3d/core/bbox/utils.py +++ b/mmdeploy/codebase/mmdet3d/core/bbox/utils.py @@ -1,11 +1,7 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.core import FUNCTION_REWRITER - -@FUNCTION_REWRITER.register_rewriter( - 'mmdet3d.core.bbox.structures.utils.points_img2cam') def points_img2cam(points, cam2img_inverse): """Project points in image coordinates to camera coordinates. diff --git a/mmdeploy/codebase/mmdet3d/core/post_processing/__init__.py b/mmdeploy/codebase/mmdet3d/core/post_processing/__init__.py index 5e206c740..ff2419b23 100644 --- a/mmdeploy/codebase/mmdet3d/core/post_processing/__init__.py +++ b/mmdeploy/codebase/mmdet3d/core/post_processing/__init__.py @@ -1,2 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .box3d_nms import * # noqa: F401,F403 +from .box3d_nms import box3d_multiclass_nms + +__all__ = ['box3d_multiclass_nms'] diff --git a/mmdeploy/codebase/mmdet3d/models/__init__.py b/mmdeploy/codebase/mmdet3d/models/__init__.py index 0d619a289..73c596a5c 100644 --- a/mmdeploy/codebase/mmdet3d/models/__init__.py +++ b/mmdeploy/codebase/mmdet3d/models/__init__.py @@ -1,11 +1,11 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .anchor_free_mono3d_head import * # noqa: F401,F403 -from .base import * # noqa: F401,F403 -from .centerpoint import * # noqa: F401,F403 -from .fcos_mono3d import * # noqa: F401,F403 -from .fcos_mono3d_head import * # noqa: F401,F403 -from .mvx_two_stage import * # noqa: F401,F403 -from .pillar_encode import * # noqa: F401,F403 -from .pillar_scatter import * # noqa: F401,F403 -from .single_stage_mono3d import * # noqa: F401,F403 -from .voxelnet import * # noqa: F401,F403 +from . import anchor_free_mono3d_head # noqa: F401,F403 +from . import base # noqa: F401,F403 +from . import centerpoint # noqa: F401,F403 +from . import fcos_mono3d # noqa: F401,F403 +from . import fcos_mono3d_head # noqa: F401,F403 +from . import mvx_two_stage # noqa: F401,F403 +from . import pillar_encode # noqa: F401,F403 +from . import pillar_scatter # noqa: F401,F403 +from . import single_stage_mono3d # noqa: F401,F403 +from . import voxelnet # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmocr/__init__.py b/mmdeploy/codebase/mmocr/__init__.py index 0683b42a3..981842f22 100644 --- a/mmdeploy/codebase/mmocr/__init__.py +++ b/mmdeploy/codebase/mmocr/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. +from . import models # noqa: F401,F403 from .deploy import * # noqa: F401,F403 -from .models import * # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmocr/models/__init__.py b/mmdeploy/codebase/mmocr/models/__init__.py index fb561ceac..577a6fb85 100644 --- a/mmdeploy/codebase/mmocr/models/__init__.py +++ b/mmdeploy/codebase/mmocr/models/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .text_detection import * # noqa: F401,F403 -from .text_recognition import * # noqa: F401,F403 +from . import text_detection # noqa: F401,F403 +from . import text_recognition # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmocr/models/text_detection/__init__.py b/mmdeploy/codebase/mmocr/models/text_detection/__init__.py index dfedbdcaa..c3fc97c67 100644 --- a/mmdeploy/codebase/mmocr/models/text_detection/__init__.py +++ b/mmdeploy/codebase/mmocr/models/text_detection/__init__.py @@ -1,7 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .fpn_cat import fpnc__forward__tensorrt -from .single_stage_text_detector import single_stage_text_detector__simple_test - -__all__ = [ - 'fpnc__forward__tensorrt', 'single_stage_text_detector__simple_test' -] +from . import fpn_cat # noqa: F401,F403 +from . import single_stage_text_detector # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmocr/models/text_recognition/__init__.py b/mmdeploy/codebase/mmocr/models/text_recognition/__init__.py index b6fc46472..775c916bb 100644 --- a/mmdeploy/codebase/mmocr/models/text_recognition/__init__.py +++ b/mmdeploy/codebase/mmocr/models/text_recognition/__init__.py @@ -1,14 +1,8 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .base import base_recognizer__forward -from .crnn_decoder import crnndecoder__forward_train__ncnn -from .encode_decode_recognizer import encode_decode_recognizer__simple_test -from .lstm_layer import bidirectionallstm__forward__ncnn -from .sar import SARNet -from .sar_decoder import * # noqa: F401,F403 -from .sar_encoder import sar_encoder__forward - -__all__ = [ - 'base_recognizer__forward', 'crnndecoder__forward_train__ncnn', - 'encode_decode_recognizer__simple_test', - 'bidirectionallstm__forward__ncnn', 'sar_encoder__forward', 'SARNet' -] +from . import base # noqa: F401,F403 +from . import crnn_decoder # noqa: F401,F403 +from . import encode_decode_recognizer # noqa: F401,F403 +from . import lstm_layer # noqa: F401,F403 +from . import sar # noqa: F401,F403 +from . import sar_decoder # noqa: F401,F403 +from . import sar_encoder # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmpose/__init__.py b/mmdeploy/codebase/mmpose/__init__.py index 03b0a6b1e..85298dd30 100644 --- a/mmdeploy/codebase/mmpose/__init__.py +++ b/mmdeploy/codebase/mmpose/__init__.py @@ -1,5 +1,5 @@ # Copyright (c) OpenMMLab. All rights reserved. +from . import models # noqa: F401,F403 from .deploy import MMPose, PoseDetection -from .models import * # noqa: F401,F403 __all__ = ['MMPose', 'PoseDetection'] diff --git a/mmdeploy/codebase/mmpose/models/__init__.py b/mmdeploy/codebase/mmpose/models/__init__.py index 0c859a49c..b1d008110 100644 --- a/mmdeploy/codebase/mmpose/models/__init__.py +++ b/mmdeploy/codebase/mmpose/models/__init__.py @@ -1,4 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .detectors import * # noqa: F401,F403 -from .heads import * # noqa: F401,F403 +from . import detectors # noqa: F401,F403 +from . import heads # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmpose/models/detectors/__init__.py b/mmdeploy/codebase/mmpose/models/detectors/__init__.py index 64d8d3262..83154a6f0 100644 --- a/mmdeploy/codebase/mmpose/models/detectors/__init__.py +++ b/mmdeploy/codebase/mmpose/models/detectors/__init__.py @@ -1,5 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .top_down import top_down__forward - -__all__ = ['top_down__forward'] +from . import top_down # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmpose/models/heads/__init__.py b/mmdeploy/codebase/mmpose/models/heads/__init__.py index ddf7095e0..1a30cb066 100644 --- a/mmdeploy/codebase/mmpose/models/heads/__init__.py +++ b/mmdeploy/codebase/mmpose/models/heads/__init__.py @@ -1,15 +1,5 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .deeppose_regression_head import deeppose_regression_head__inference_model -from .topdown_heatmap_multi_stage_head import \ - topdown_heatmap_msmu_head__inference_model -from .topdown_heatmap_simple_head import \ - topdown_heatmap_simple_head__inference_model -from .vipnas_heatmap_simple_head import \ - vipnas_heatmap_simple_head__inference_model - -__all__ = [ - 'topdown_heatmap_simple_head__inference_model', - 'topdown_heatmap_msmu_head__inference_model', - 'deeppose_regression_head__inference_model', - 'vipnas_heatmap_simple_head__inference_model' -] +from . import deeppose_regression_head # noqa: F401,F403 +from . import topdown_heatmap_multi_stage_head # noqa: F401,F403 +from . import topdown_heatmap_simple_head # noqa: F401,F403 +from . import vipnas_heatmap_simple_head # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmrotate/__init__.py b/mmdeploy/codebase/mmrotate/__init__.py index 0d3510f91..3d912ea67 100644 --- a/mmdeploy/codebase/mmrotate/__init__.py +++ b/mmdeploy/codebase/mmrotate/__init__.py @@ -1,4 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .core import * # noqa: F401,F403 +from . import core # noqa: F401,F403 +from . import models # noqa: F401,F403 from .deploy import * # noqa: F401,F403 -from .models import * # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmrotate/core/__init__.py b/mmdeploy/codebase/mmrotate/core/__init__.py index 7c0065f72..0908a50ea 100644 --- a/mmdeploy/codebase/mmrotate/core/__init__.py +++ b/mmdeploy/codebase/mmrotate/core/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .bbox import * # noqa: F401,F403 -from .post_processing import * # noqa: F401,F403 +from . import bbox # noqa: F401,F403 +from . import post_processing # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmrotate/core/bbox/__init__.py b/mmdeploy/codebase/mmrotate/core/bbox/__init__.py index d7f70b075..4888b25b1 100644 --- a/mmdeploy/codebase/mmrotate/core/bbox/__init__.py +++ b/mmdeploy/codebase/mmrotate/core/bbox/__init__.py @@ -1,5 +1,5 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .delta_midpointoffset_rbbox_coder import * # noqa: F401,F403 -from .delta_xywha_rbbox_coder import * # noqa: F401,F403 -from .gliding_vertex_coder import * # noqa: F401,F403 -from .transforms import * # noqa: F401,F403 +from . import delta_midpointoffset_rbbox_coder # noqa: F401,F403 +from . import delta_xywha_rbbox_coder # noqa: F401,F403 +from . import gliding_vertex_coder # noqa: F401,F403 +from . import transforms # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmrotate/core/post_processing/bbox_nms.py b/mmdeploy/codebase/mmrotate/core/post_processing/bbox_nms.py index 4a7b8375b..4c8d70c89 100644 --- a/mmdeploy/codebase/mmrotate/core/post_processing/bbox_nms.py +++ b/mmdeploy/codebase/mmrotate/core/post_processing/bbox_nms.py @@ -5,8 +5,9 @@ from torch import Tensor import mmdeploy from mmdeploy.core import FUNCTION_REWRITER, mark -from mmdeploy.mmcv.ops import (ONNXNMSop, ONNXNMSRotatedOp, TRTBatchedNMSop, - TRTBatchedRotatedNMSop) +from mmdeploy.mmcv.ops.nms import ONNXNMSop, TRTBatchedNMSop +from mmdeploy.mmcv.ops.nms_rotated import (ONNXNMSRotatedOp, + TRTBatchedRotatedNMSop) def select_rnms_index(scores: torch.Tensor, diff --git a/mmdeploy/codebase/mmrotate/models/__init__.py b/mmdeploy/codebase/mmrotate/models/__init__.py index 65edb9dba..f559c90ae 100644 --- a/mmdeploy/codebase/mmrotate/models/__init__.py +++ b/mmdeploy/codebase/mmrotate/models/__init__.py @@ -1,4 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .dense_heads import * # noqa: F401,F403 -from .roi_heads import * # noqa: F401,F403 -from .single_stage_rotated_detector import * # noqa: F401,F403 +from . import dense_heads # noqa: F401,F403 +from . import roi_heads # noqa: F401,F403 +from . import single_stage_rotated_detector # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmrotate/models/dense_heads/__init__.py b/mmdeploy/codebase/mmrotate/models/dense_heads/__init__.py index 90163f835..d588b52b5 100644 --- a/mmdeploy/codebase/mmrotate/models/dense_heads/__init__.py +++ b/mmdeploy/codebase/mmrotate/models/dense_heads/__init__.py @@ -1,9 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .oriented_rpn_head import oriented_rpn_head__get_bboxes -from .rotated_anchor_head import rotated_anchor_head__get_bbox -from .rotated_rpn_head import rotated_rpn_head__get_bboxes - -__all__ = [ - 'oriented_rpn_head__get_bboxes', 'rotated_anchor_head__get_bbox', - 'rotated_rpn_head__get_bboxes' -] +from . import oriented_rpn_head # noqa: F401,F403 +from . import rotated_anchor_head # noqa: F401,F403 +from . import rotated_rpn_head # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmrotate/models/dense_heads/oriented_rpn_head.py b/mmdeploy/codebase/mmrotate/models/dense_heads/oriented_rpn_head.py index 9b2adfc2f..34842e1a7 100644 --- a/mmdeploy/codebase/mmrotate/models/dense_heads/oriented_rpn_head.py +++ b/mmdeploy/codebase/mmrotate/models/dense_heads/oriented_rpn_head.py @@ -1,8 +1,8 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.codebase.mmdet import (get_post_processing_params, - pad_with_value_if_necessary) +from mmdeploy.codebase.mmdet.deploy import (get_post_processing_params, + pad_with_value_if_necessary) from mmdeploy.codebase.mmrotate.core.post_processing import \ fake_multiclass_nms_rotated from mmdeploy.core import FUNCTION_REWRITER diff --git a/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_anchor_head.py b/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_anchor_head.py index 7536590ed..422ad4c78 100644 --- a/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_anchor_head.py +++ b/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_anchor_head.py @@ -1,8 +1,8 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.codebase.mmdet import (get_post_processing_params, - pad_with_value_if_necessary) +from mmdeploy.codebase.mmdet.deploy import (get_post_processing_params, + pad_with_value_if_necessary) from mmdeploy.codebase.mmrotate.core.post_processing import \ multiclass_nms_rotated from mmdeploy.core import FUNCTION_REWRITER diff --git a/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_rpn_head.py b/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_rpn_head.py index 586bec822..d93df1746 100644 --- a/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_rpn_head.py +++ b/mmdeploy/codebase/mmrotate/models/dense_heads/rotated_rpn_head.py @@ -1,9 +1,9 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch -from mmdeploy.codebase.mmdet import (get_post_processing_params, - pad_with_value_if_necessary) from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms +from mmdeploy.codebase.mmdet.deploy import (get_post_processing_params, + pad_with_value_if_necessary) from mmdeploy.core import FUNCTION_REWRITER from mmdeploy.utils import is_dynamic_shape diff --git a/mmdeploy/codebase/mmrotate/models/roi_heads/__init__.py b/mmdeploy/codebase/mmrotate/models/roi_heads/__init__.py index 709df00e1..449c984b1 100644 --- a/mmdeploy/codebase/mmrotate/models/roi_heads/__init__.py +++ b/mmdeploy/codebase/mmrotate/models/roi_heads/__init__.py @@ -1,16 +1,7 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .gv_bbox_head import gv_bbox_head__get_bboxes -from .gv_ratio_roi_head import gv_ratio_roi_head__simple_test_bboxes -from .oriented_standard_roi_head import \ - oriented_standard_roi_head__simple_test_bboxes -from .roi_extractors import rotated_single_roi_extractor__forward__tensorrt -from .roi_trans_roi_head import roi_trans_roi_head__simple_test -from .rotated_bbox_head import rotated_bbox_head__get_bboxes - -__all__ = [ - 'gv_bbox_head__get_bboxes', 'gv_ratio_roi_head__simple_test_bboxes', - 'oriented_standard_roi_head__simple_test_bboxes', - 'roi_trans_roi_head__simple_test', - 'rotated_single_roi_extractor__forward__tensorrt', - 'rotated_bbox_head__get_bboxes' -] +from . import gv_bbox_head # noqa: F401,F403 +from . import gv_ratio_roi_head # noqa: F401,F403 +from . import oriented_standard_roi_head # noqa: F401,F403 +from . import roi_extractors # noqa: F401,F403 +from . import roi_trans_roi_head # noqa: F401,F403 +from . import rotated_bbox_head # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmrotate/models/roi_heads/gv_bbox_head.py b/mmdeploy/codebase/mmrotate/models/roi_heads/gv_bbox_head.py index 3d777218d..a5afe7b94 100644 --- a/mmdeploy/codebase/mmrotate/models/roi_heads/gv_bbox_head.py +++ b/mmdeploy/codebase/mmrotate/models/roi_heads/gv_bbox_head.py @@ -1,7 +1,7 @@ # Copyright (c) OpenMMLab. All rights reserved. import torch.nn.functional as F -from mmdeploy.codebase.mmdet import get_post_processing_params +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.codebase.mmrotate.core.post_processing import \ multiclass_nms_rotated from mmdeploy.core import FUNCTION_REWRITER diff --git a/mmdeploy/codebase/mmrotate/models/roi_heads/rotated_bbox_head.py b/mmdeploy/codebase/mmrotate/models/roi_heads/rotated_bbox_head.py index 103ebf2f4..99239dce9 100644 --- a/mmdeploy/codebase/mmrotate/models/roi_heads/rotated_bbox_head.py +++ b/mmdeploy/codebase/mmrotate/models/roi_heads/rotated_bbox_head.py @@ -2,7 +2,7 @@ import torch import torch.nn.functional as F -from mmdeploy.codebase.mmdet import get_post_processing_params +from mmdeploy.codebase.mmdet.deploy import get_post_processing_params from mmdeploy.codebase.mmrotate.core.post_processing import \ multiclass_nms_rotated from mmdeploy.core import FUNCTION_REWRITER diff --git a/mmdeploy/codebase/mmseg/__init__.py b/mmdeploy/codebase/mmseg/__init__.py index 0683b42a3..981842f22 100644 --- a/mmdeploy/codebase/mmseg/__init__.py +++ b/mmdeploy/codebase/mmseg/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. +from . import models # noqa: F401,F403 from .deploy import * # noqa: F401,F403 -from .models import * # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmseg/models/__init__.py b/mmdeploy/codebase/mmseg/models/__init__.py index f8c63589a..6e76b282f 100644 --- a/mmdeploy/codebase/mmseg/models/__init__.py +++ b/mmdeploy/codebase/mmseg/models/__init__.py @@ -1,4 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .decode_heads import * # noqa: F401,F403 -from .segmentors import * # noqa: F401,F403 -from .utils import * # noqa: F401,F403 +from . import decode_heads # noqa: F401,F403 +from . import segmentors # noqa: F401,F403 +from . import utils # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmseg/models/decode_heads/__init__.py b/mmdeploy/codebase/mmseg/models/decode_heads/__init__.py index 19aec81e6..48bb1b80b 100644 --- a/mmdeploy/codebase/mmseg/models/decode_heads/__init__.py +++ b/mmdeploy/codebase/mmseg/models/decode_heads/__init__.py @@ -1,9 +1,4 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .aspp_head import aspp_head__forward -from .ema_head import ema_module__forward -from .point_head import point_head__get_points_test__tensorrt - -__all__ = [ - 'aspp_head__forward', 'ema_module__forward', - 'point_head__get_points_test__tensorrt' -] +from . import aspp_head # noqa: F401,F403 +from . import ema_head # noqa: F401,F403 +from . import point_head # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmseg/models/segmentors/__init__.py b/mmdeploy/codebase/mmseg/models/segmentors/__init__.py index cc3a78aa8..b5af661d1 100644 --- a/mmdeploy/codebase/mmseg/models/segmentors/__init__.py +++ b/mmdeploy/codebase/mmseg/models/segmentors/__init__.py @@ -1,9 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .base import base_segmentor__forward -from .encoder_decoder import (encoder_decoder__simple_test, - encoder_decoder__simple_test__rknn) - -__all__ = [ - 'base_segmentor__forward', 'encoder_decoder__simple_test', - 'encoder_decoder__simple_test__rknn' -] +from . import base # noqa: F401,F403 +from . import encoder_decoder # noqa: F401,F403 diff --git a/mmdeploy/codebase/mmseg/models/utils/__init__.py b/mmdeploy/codebase/mmseg/models/utils/__init__.py index 954eaa348..0b872f220 100644 --- a/mmdeploy/codebase/mmseg/models/utils/__init__.py +++ b/mmdeploy/codebase/mmseg/models/utils/__init__.py @@ -1,4 +1,2 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .up_conv_block import up_conv_block__forward - -__all__ = ['up_conv_block__forward'] +from . import up_conv_block # noqa: F401,F403 diff --git a/mmdeploy/mmcv/__init__.py b/mmdeploy/mmcv/__init__.py index a5896f0c3..aedc41397 100644 --- a/mmdeploy/mmcv/__init__.py +++ b/mmdeploy/mmcv/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .cnn import * # noqa: F401,F403 -from .ops import * # noqa: F401,F403 +from . import cnn # noqa: F401,F403 +from . import ops # noqa: F401,F403 diff --git a/mmdeploy/mmcv/cnn/__init__.py b/mmdeploy/mmcv/cnn/__init__.py index 383569b3c..1754305f4 100644 --- a/mmdeploy/mmcv/cnn/__init__.py +++ b/mmdeploy/mmcv/cnn/__init__.py @@ -1,15 +1,8 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .context_block import context_block_spatial_pool -from .conv2d_adaptive_padding import ( - AdaptivePadOp, conv2d_adaptive_padding__forward__tensorrt) -from .hsigmoid import hsigmoid__forward__ncnn -from .hswish import hswish__forward__ncnn -from .transformer import (MultiHeadAttentionop, - multiheadattention__forward__ncnn) +from . import context_block # noqa: F401,F403 +from . import hsigmoid # noqa: F401,F403 +from . import hswish # noqa: F401,F403 +from .conv2d_adaptive_padding import AdaptivePadOp +from .transformer import MultiHeadAttentionop -__all__ = [ - 'multiheadattention__forward__ncnn', 'MultiHeadAttentionop', - 'hswish__forward__ncnn', 'hsigmoid__forward__ncnn', - 'context_block_spatial_pool', 'conv2d_adaptive_padding__forward__tensorrt', - 'AdaptivePadOp' -] +__all__ = ['AdaptivePadOp', 'MultiHeadAttentionop'] diff --git a/mmdeploy/mmcv/ops/__init__.py b/mmdeploy/mmcv/ops/__init__.py index bdcf7347d..a96ed0036 100644 --- a/mmdeploy/mmcv/ops/__init__.py +++ b/mmdeploy/mmcv/ops/__init__.py @@ -1,15 +1,14 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .deform_conv import deform_conv_openvino -from .modulated_deform_conv import modulated_deform_conv_default -from .nms import * # noqa: F401,F403 -from .nms_rotated import * # noqa: F401,F403 -from .point_sample import * # noqa: F401,F403 -from .roi_align import roi_align_default -from .roi_align_rotated import roi_align_rotated_default -from .transformer import patch_embed__forward__ncnn +from . import deform_conv # noqa: F401,F403 +from . import modulated_deform_conv # noqa: F401,F403 +from . import point_sample # noqa: F401,F403 +from . import roi_align # noqa: F401,F403 +from . import roi_align_rotated # noqa: F401,F403 +from . import transformer # noqa: F401,F403 +from .nms import ONNXNMSop, TRTBatchedNMSop +from .nms_rotated import ONNXNMSRotatedOp, TRTBatchedRotatedNMSop __all__ = [ - 'roi_align_default', 'modulated_deform_conv_default', - 'deform_conv_openvino', 'roi_align_rotated_default', - 'patch_embed__forward__ncnn' + 'ONNXNMSop', 'TRTBatchedNMSop', 'ONNXNMSRotatedOp', + 'TRTBatchedRotatedNMSop' ] diff --git a/mmdeploy/pytorch/__init__.py b/mmdeploy/pytorch/__init__.py index c086abb19..e756b73d4 100644 --- a/mmdeploy/pytorch/__init__.py +++ b/mmdeploy/pytorch/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .functions import * # noqa: F401,F403 -from .ops import * # noqa: F401,F403 +from . import functions # noqa: F401,F403 +from . import ops # noqa: F401,F403 diff --git a/mmdeploy/pytorch/functions/__init__.py b/mmdeploy/pytorch/functions/__init__.py index d6918527c..e2e6d9f86 100644 --- a/mmdeploy/pytorch/functions/__init__.py +++ b/mmdeploy/pytorch/functions/__init__.py @@ -1,34 +1,21 @@ # Copyright (c) OpenMMLab. All rights reserved. -from . import multi_head_attention_forward -from .adaptive_pool import (adaptive_avg_pool2d__default, - adaptive_avg_pool2d__ncnn) -from .atan2 import atan2__default -from .chunk import chunk__ncnn, chunk__torchscript -from .clip import clip__coreml -from .expand import expand__ncnn -from .flatten import flatten__coreml -from .getattribute import tensor__getattribute__ncnn -from .group_norm import group_norm__ncnn -from .interpolate import interpolate__ncnn, interpolate__tensorrt -from .linear import linear__ncnn -from .masked_fill import masked_fill__onnxruntime -from .mod import mod__tensorrt -from .normalize import normalize__ncnn -from .repeat import tensor__repeat__tensorrt -from .size import tensor__size__ncnn -from .tensor_getitem import tensor__getitem__ascend -from .tensor_setitem import tensor__setitem__default -from .topk import topk__dynamic, topk__tensorrt -from .triu import triu__default - -__all__ = [ - 'tensor__getattribute__ncnn', 'group_norm__ncnn', 'interpolate__ncnn', - 'interpolate__tensorrt', 'linear__ncnn', 'tensor__repeat__tensorrt', - 'tensor__size__ncnn', 'topk__dynamic', 'topk__tensorrt', 'chunk__ncnn', - 'triu__default', 'atan2__default', 'normalize__ncnn', 'expand__ncnn', - 'chunk__torchscript', 'masked_fill__onnxruntime', - 'tensor__setitem__default', 'tensor__getitem__ascend', - 'adaptive_avg_pool2d__default', 'adaptive_avg_pool2d__ncnn', - 'multi_head_attention_forward', 'flatten__coreml', 'clip__coreml', - 'mod__tensorrt' -] +from . import adaptive_pool # noqa: F401,F403 +from . import atan2 # noqa: F401,F403 +from . import chunk # noqa: F401,F403 +from . import clip # noqa: F401,F403 +from . import expand # noqa: F401,F403 +from . import flatten # noqa: F401,F403 +from . import getattribute # noqa: F401,F403 +from . import group_norm # noqa: F401,F403 +from . import interpolate # noqa: F401,F403 +from . import linear # noqa: F401,F403 +from . import masked_fill # noqa: F401,F403 +from . import mod # noqa: F401,F403 +from . import multi_head_attention_forward # noqa: F401,F403 +from . import normalize # noqa: F401,F403 +from . import repeat # noqa: F401,F403 +from . import size # noqa: F401,F403 +from . import tensor_getitem # noqa: F401,F403 +from . import tensor_setitem # noqa: F401,F403 +from . import topk # noqa: F401,F403 +from . import triu # noqa: F401,F403 diff --git a/mmdeploy/pytorch/ops/__init__.py b/mmdeploy/pytorch/ops/__init__.py index 56f89a621..40eea584e 100644 --- a/mmdeploy/pytorch/ops/__init__.py +++ b/mmdeploy/pytorch/ops/__init__.py @@ -1,19 +1,12 @@ # Copyright (c) OpenMMLab. All rights reserved. -from .adaptive_pool import adaptive_avg_pool2d__ncnn -from .gelu import gelu__ncnn -from .grid_sampler import grid_sampler__default -from .hardsigmoid import hardsigmoid__default -from .instance_norm import instance_norm__tensorrt -from .layer_norm import layer_norm__ncnn -from .linear import linear__ncnn -from .lstm import generic_rnn__ncnn -from .pad import _prepare_onnx_paddings__tensorrt -from .roll import roll_default -from .squeeze import squeeze__default - -__all__ = [ - 'grid_sampler__default', 'hardsigmoid__default', 'instance_norm__tensorrt', - 'generic_rnn__ncnn', 'squeeze__default', 'adaptive_avg_pool2d__ncnn', - 'gelu__ncnn', 'layer_norm__ncnn', 'linear__ncnn', - '_prepare_onnx_paddings__tensorrt', 'roll_default' -] +from . import adaptive_pool # noqa: F401,F403 +from . import gelu # noqa: F401,F403 +from . import grid_sampler # noqa: F401,F403 +from . import hardsigmoid # noqa: F401,F403 +from . import instance_norm # noqa: F401,F403 +from . import layer_norm # noqa: F401,F403 +from . import linear # noqa: F401,F403 +from . import lstm # noqa: F401,F403 +from . import pad # noqa: F401,F403 +from . import roll # noqa: F401,F403 +from . import squeeze # noqa: F401,F403 diff --git a/tests/test_codebase/test_mmdet/test_mmdet_core.py b/tests/test_codebase/test_mmdet/test_mmdet_core.py index 6469aa790..45e31aadc 100644 --- a/tests/test_codebase/test_mmdet/test_mmdet_core.py +++ b/tests/test_codebase/test_mmdet/test_mmdet_core.py @@ -21,7 +21,7 @@ except ImportError: @backend_checker(Backend.TENSORRT) def test_multiclass_nms_static(): - from mmdeploy.codebase.mmdet.core import multiclass_nms + from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms deploy_cfg = mmcv.Config( dict( onnx_config=dict(output_names=None, input_shape=None), @@ -56,7 +56,7 @@ def test_multiclass_nms_static(): boxes = torch.rand(1, 5, 4).cuda() scores = torch.rand(1, 5, 8).cuda() max_output_boxes_per_class = 20 - keep_top_k = 10 + keep_top_k = 5 wrapped_func = WrapFunction( multiclass_nms, max_output_boxes_per_class=max_output_boxes_per_class, @@ -230,7 +230,7 @@ def test__distancepointbboxcoder__decode(backend_type: Backend): def test_multiclass_nms_with_keep_top_k(pre_top_k): backend_type = 'onnxruntime' - from mmdeploy.codebase.mmdet.core import multiclass_nms + from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms max_output_boxes_per_class = 20 keep_top_k = 15 deploy_cfg = mmcv.Config( @@ -347,7 +347,7 @@ def test__anchorgenerator__single_level_grid_priors(): @backend_checker(Backend.ASCEND) def test_multiclass_nms__ascend(): - from mmdeploy.codebase.mmdet.core import multiclass_nms + from mmdeploy.codebase.mmdet.core.post_processing import multiclass_nms deploy_cfg = mmcv.Config( dict( onnx_config=dict( diff --git a/tests/test_codebase/test_mmdet/test_mmdet_utils.py b/tests/test_codebase/test_mmdet/test_mmdet_utils.py index 433315358..3ab8a4c89 100644 --- a/tests/test_codebase/test_mmdet/test_mmdet_utils.py +++ b/tests/test_codebase/test_mmdet/test_mmdet_utils.py @@ -12,9 +12,10 @@ try: except ImportError: pytest.skip(f'{Codebase.MMDET} is not installed.', allow_module_level=True) -from mmdeploy.codebase.mmdet import (clip_bboxes, get_post_processing_params, - pad_with_value, - pad_with_value_if_necessary) +from mmdeploy.codebase.mmdet.deploy import (clip_bboxes, + get_post_processing_params, + pad_with_value, + pad_with_value_if_necessary) def test_clip_bboxes(): diff --git a/tests/test_codebase/test_mmocr/test_mmocr_models.py b/tests/test_codebase/test_mmocr/test_mmocr_models.py index 6dd304978..af36275f5 100644 --- a/tests/test_codebase/test_mmocr/test_mmocr_models.py +++ b/tests/test_codebase/test_mmocr/test_mmocr_models.py @@ -29,8 +29,7 @@ class FPNCNeckModel(FPNC): def forward(self, inputs): neck_inputs = [ - torch.ones(1, channel, inputs.shape[-2], inputs.shape[-1]) - for channel in self.in_channels + inputs.repeat([1, channel, 1, 1]) for channel in self.in_channels ] output = self.neck.forward(neck_inputs) return output diff --git a/tests/test_codebase/test_mmrotate/test_mmrotate_core.py b/tests/test_codebase/test_mmrotate/test_mmrotate_core.py index 3afb681a5..174b888cc 100644 --- a/tests/test_codebase/test_mmrotate/test_mmrotate_core.py +++ b/tests/test_codebase/test_mmrotate/test_mmrotate_core.py @@ -19,7 +19,8 @@ except ImportError: @backend_checker(Backend.ONNXRUNTIME) def test_multiclass_nms_rotated(): - from mmdeploy.codebase.mmrotate.core import multiclass_nms_rotated + from mmdeploy.codebase.mmrotate.core.post_processing import \ + multiclass_nms_rotated deploy_cfg = mmcv.Config( dict( onnx_config=dict(output_names=None, input_shape=None), @@ -70,7 +71,8 @@ def test_multiclass_nms_rotated(): def test_multiclass_nms_rotated_with_keep_top_k(pre_top_k): backend_type = 'onnxruntime' - from mmdeploy.codebase.mmrotate.core import multiclass_nms_rotated + from mmdeploy.codebase.mmrotate.core.post_processing import \ + multiclass_nms_rotated keep_top_k = 15 deploy_cfg = mmcv.Config( dict( @@ -226,7 +228,8 @@ def test_delta_midpointoffset_rbbox_delta2bbox(backend_type: Backend): @backend_checker(Backend.ONNXRUNTIME) def test_fake_multiclass_nms_rotated(): - from mmdeploy.codebase.mmrotate.core import fake_multiclass_nms_rotated + from mmdeploy.codebase.mmrotate.core.post_processing import \ + fake_multiclass_nms_rotated deploy_cfg = mmcv.Config( dict( onnx_config=dict(output_names=None, input_shape=None), diff --git a/tests/test_codebase/test_mmseg/test_mmseg_models.py b/tests/test_codebase/test_mmseg/test_mmseg_models.py index 8d4f45555..ef7ecbd4d 100644 --- a/tests/test_codebase/test_mmseg/test_mmseg_models.py +++ b/tests/test_codebase/test_mmseg/test_mmseg_models.py @@ -211,8 +211,7 @@ def test_aspphead_forward(backend): rewrite_outputs, model_outputs, rtol=1e-03, atol=1e-05) -@pytest.mark.parametrize('backend', - [Backend.ONNXRUNTIME, Backend.OPENVINO, Backend.NCNN]) +@pytest.mark.parametrize('backend', [Backend.ONNXRUNTIME, Backend.OPENVINO]) def test_psphead_forward(backend): check_backend(backend) from mmseg.models.decode_heads import PSPHead