Unverified Commit 89374d38 authored by Jingwei Zhang's avatar Jingwei Zhang Committed by GitHub
Browse files

[Fix]: Fix the bug of importing typings (#2114)

parent e00a74ec
...@@ -9,7 +9,7 @@ from torch import nn as nn ...@@ -9,7 +9,7 @@ from torch import nn as nn
from mmdet3d.registry import MODELS from mmdet3d.registry import MODELS
from mmdet3d.structures.det3d_data_sample import SampleList from mmdet3d.structures.det3d_data_sample import SampleList
from mmdet3d.utils.typing import ConfigType from mmdet3d.utils.typing_utils import ConfigType
class Base3DDecodeHead(BaseModule, metaclass=ABCMeta): class Base3DDecodeHead(BaseModule, metaclass=ABCMeta):
......
...@@ -5,7 +5,7 @@ from mmcv.cnn.bricks import ConvModule ...@@ -5,7 +5,7 @@ from mmcv.cnn.bricks import ConvModule
from torch import Tensor from torch import Tensor
from mmdet3d.registry import MODELS from mmdet3d.registry import MODELS
from mmdet3d.utils.typing import ConfigType from mmdet3d.utils.typing_utils import ConfigType
from .pointnet2_head import PointNet2Head from .pointnet2_head import PointNet2Head
......
...@@ -7,7 +7,7 @@ from torch import nn as nn ...@@ -7,7 +7,7 @@ from torch import nn as nn
from mmdet3d.models.layers import PointFPModule from mmdet3d.models.layers import PointFPModule
from mmdet3d.registry import MODELS from mmdet3d.registry import MODELS
from mmdet3d.utils.typing import ConfigType from mmdet3d.utils.typing_utils import ConfigType
from .decode_head import Base3DDecodeHead from .decode_head import Base3DDecodeHead
......
...@@ -11,8 +11,8 @@ from torch import nn as nn ...@@ -11,8 +11,8 @@ from torch import nn as nn
from mmdet3d.models.task_modules import PseudoSampler from mmdet3d.models.task_modules import PseudoSampler
from mmdet3d.models.test_time_augs import merge_aug_bboxes_3d from mmdet3d.models.test_time_augs import merge_aug_bboxes_3d
from mmdet3d.registry import MODELS, TASK_UTILS from mmdet3d.registry import MODELS, TASK_UTILS
from mmdet3d.utils.typing import (ConfigType, InstanceList, OptConfigType, from mmdet3d.utils.typing_utils import (ConfigType, InstanceList,
OptInstanceList) OptConfigType, OptInstanceList)
from .base_3d_dense_head import Base3DDenseHead from .base_3d_dense_head import Base3DDenseHead
from .train_mixins import AnchorTrainMixin from .train_mixins import AnchorTrainMixin
......
...@@ -13,7 +13,7 @@ from torch import Tensor ...@@ -13,7 +13,7 @@ from torch import Tensor
from mmdet3d.models.layers import box3d_multiclass_nms from mmdet3d.models.layers import box3d_multiclass_nms
from mmdet3d.structures import limit_period, xywhr2xyxyr from mmdet3d.structures import limit_period, xywhr2xyxyr
from mmdet3d.structures.det3d_data_sample import SampleList from mmdet3d.structures.det3d_data_sample import SampleList
from mmdet3d.utils.typing import InstanceList, OptMultiConfig from mmdet3d.utils.typing_utils import InstanceList, OptMultiConfig
class Base3DDenseHead(BaseModule, metaclass=ABCMeta): class Base3DDenseHead(BaseModule, metaclass=ABCMeta):
......
...@@ -10,7 +10,7 @@ from torch import Tensor ...@@ -10,7 +10,7 @@ from torch import Tensor
from mmdet3d.models.layers import nms_bev, nms_normal_bev from mmdet3d.models.layers import nms_bev, nms_normal_bev
from mmdet3d.registry import MODELS from mmdet3d.registry import MODELS
from mmdet3d.structures import limit_period, xywhr2xyxyr from mmdet3d.structures import limit_period, xywhr2xyxyr
from mmdet3d.utils.typing import InstanceList from mmdet3d.utils.typing_utils import InstanceList
from ...structures.det3d_data_sample import SampleList from ...structures.det3d_data_sample import SampleList
from .anchor3d_head import Anchor3DHead from .anchor3d_head import Anchor3DHead
......
...@@ -15,8 +15,8 @@ from torch.nn import functional as F ...@@ -15,8 +15,8 @@ from torch.nn import functional as F
from mmdet3d.models.layers import box3d_multiclass_nms from mmdet3d.models.layers import box3d_multiclass_nms
from mmdet3d.registry import MODELS from mmdet3d.registry import MODELS
from mmdet3d.structures import points_cam2img, points_img2cam, xywhr2xyxyr from mmdet3d.structures import points_cam2img, points_img2cam, xywhr2xyxyr
from mmdet3d.utils.typing import (ConfigType, InstanceList, OptConfigType, from mmdet3d.utils.typing_utils import (ConfigType, InstanceList,
OptInstanceList) OptConfigType, OptInstanceList)
from .fcos_mono3d_head import FCOSMono3DHead from .fcos_mono3d_head import FCOSMono3DHead
......
...@@ -15,7 +15,7 @@ from mmdet3d.structures.bbox_3d import (BaseInstance3DBoxes, ...@@ -15,7 +15,7 @@ from mmdet3d.structures.bbox_3d import (BaseInstance3DBoxes,
DepthInstance3DBoxes, DepthInstance3DBoxes,
LiDARInstance3DBoxes) LiDARInstance3DBoxes)
from mmdet3d.structures.det3d_data_sample import SampleList from mmdet3d.structures.det3d_data_sample import SampleList
from mmdet3d.utils.typing import InstanceList from mmdet3d.utils.typing_utils import InstanceList
@MODELS.register_module() @MODELS.register_module()
......
...@@ -7,7 +7,8 @@ from mmengine.structures import InstanceData ...@@ -7,7 +7,8 @@ from mmengine.structures import InstanceData
from mmdet3d.registry import MODELS from mmdet3d.registry import MODELS
from mmdet3d.structures.det3d_data_sample import (ForwardResults, from mmdet3d.structures.det3d_data_sample import (ForwardResults,
OptSampleList, SampleList) OptSampleList, SampleList)
from mmdet3d.utils.typing import OptConfigType, OptInstanceList, OptMultiConfig from mmdet3d.utils.typing_utils import (OptConfigType, OptInstanceList,
OptMultiConfig)
@MODELS.register_module() @MODELS.register_module()
......
...@@ -11,7 +11,7 @@ from torch import Tensor ...@@ -11,7 +11,7 @@ from torch import Tensor
from mmdet3d.models import make_sparse_convmodule from mmdet3d.models import make_sparse_convmodule
from mmdet3d.models.layers.spconv import IS_SPCONV2_AVAILABLE from mmdet3d.models.layers.spconv import IS_SPCONV2_AVAILABLE
from mmdet3d.utils.typing import InstanceList from mmdet3d.utils.typing_utils import InstanceList
if IS_SPCONV2_AVAILABLE: if IS_SPCONV2_AVAILABLE:
from spconv.pytorch import (SparseConvTensor, SparseMaxPool3d, from spconv.pytorch import (SparseConvTensor, SparseMaxPool3d,
...@@ -26,7 +26,7 @@ from mmdet3d.models.layers import nms_bev, nms_normal_bev ...@@ -26,7 +26,7 @@ from mmdet3d.models.layers import nms_bev, nms_normal_bev
from mmdet3d.registry import MODELS, TASK_UTILS from mmdet3d.registry import MODELS, TASK_UTILS
from mmdet3d.structures.bbox_3d import (LiDARInstance3DBoxes, from mmdet3d.structures.bbox_3d import (LiDARInstance3DBoxes,
rotation_3d_in_axis, xywhr2xyxyr) rotation_3d_in_axis, xywhr2xyxyr)
from mmdet3d.utils.typing import SamplingResultList from mmdet3d.utils.typing_utils import SamplingResultList
@MODELS.register_module() @MODELS.register_module()
......
...@@ -16,7 +16,7 @@ from mmdet3d.models.layers.pointnet_modules import build_sa_module ...@@ -16,7 +16,7 @@ from mmdet3d.models.layers.pointnet_modules import build_sa_module
from mmdet3d.registry import MODELS, TASK_UTILS from mmdet3d.registry import MODELS, TASK_UTILS
from mmdet3d.structures.bbox_3d import (LiDARInstance3DBoxes, from mmdet3d.structures.bbox_3d import (LiDARInstance3DBoxes,
rotation_3d_in_axis, xywhr2xyxyr) rotation_3d_in_axis, xywhr2xyxyr)
from mmdet3d.utils.typing import InstanceList, SamplingResultList from mmdet3d.utils.typing_utils import InstanceList, SamplingResultList
@MODELS.register_module() @MODELS.register_module()
......
...@@ -8,7 +8,7 @@ from torch.nn import functional as F ...@@ -8,7 +8,7 @@ from torch.nn import functional as F
from mmdet3d.registry import MODELS, TASK_UTILS from mmdet3d.registry import MODELS, TASK_UTILS
from mmdet3d.structures import bbox3d2roi from mmdet3d.structures import bbox3d2roi
from mmdet3d.utils.typing import InstanceList, SampleList from mmdet3d.utils.typing_utils import InstanceList, SampleList
from .base_3droi_head import Base3DRoIHead from .base_3droi_head import Base3DRoIHead
......
...@@ -4,8 +4,9 @@ from .collect_env import collect_env ...@@ -4,8 +4,9 @@ from .collect_env import collect_env
from .compat_cfg import compat_cfg from .compat_cfg import compat_cfg
from .misc import replace_ceph_backend from .misc import replace_ceph_backend
from .setup_env import register_all_modules, setup_multi_processes from .setup_env import register_all_modules, setup_multi_processes
from .typing import (ConfigType, InstanceList, MultiConfig, OptConfigType, from .typing_utils import (ConfigType, InstanceList, MultiConfig,
OptInstanceList, OptMultiConfig, OptSamplingResultList) OptConfigType, OptInstanceList, OptMultiConfig,
OptSamplingResultList)
__all__ = [ __all__ = [
'collect_env', 'setup_multi_processes', 'compat_cfg', 'collect_env', 'setup_multi_processes', 'compat_cfg',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment