Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
mmdetection3d
Commits
1f9eb6c8
Commit
1f9eb6c8
authored
Nov 15, 2022
by
Xiangxu-0103
Committed by
ZwwWayne
Dec 03, 2022
Browse files
[Enhance] Refactor the import of `mmdet` (#1947)
* fix config * refactor import of `mmdet` * fix lint * fix lint
parent
c5bc9ac9
Changes
66
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
20 additions
and
17 deletions
+20
-17
mmdet3d/models/roi_heads/bbox_heads/h3d_bbox_head.py
mmdet3d/models/roi_heads/bbox_heads/h3d_bbox_head.py
+1
-1
mmdet3d/models/roi_heads/bbox_heads/parta2_bbox_head.py
mmdet3d/models/roi_heads/bbox_heads/parta2_bbox_head.py
+1
-1
mmdet3d/models/roi_heads/bbox_heads/point_rcnn_bbox_head.py
mmdet3d/models/roi_heads/bbox_heads/point_rcnn_bbox_head.py
+1
-1
mmdet3d/models/roi_heads/mask_heads/pointwise_semantic_head.py
...3d/models/roi_heads/mask_heads/pointwise_semantic_head.py
+1
-1
mmdet3d/models/roi_heads/mask_heads/primitive_head.py
mmdet3d/models/roi_heads/mask_heads/primitive_head.py
+1
-1
mmdet3d/models/roi_heads/part_aggregation_roi_head.py
mmdet3d/models/roi_heads/part_aggregation_roi_head.py
+1
-1
mmdet3d/models/roi_heads/point_rcnn_roi_head.py
mmdet3d/models/roi_heads/point_rcnn_roi_head.py
+1
-1
mmdet3d/models/roi_heads/roi_extractors/__init__.py
mmdet3d/models/roi_heads/roi_extractors/__init__.py
+1
-0
mmdet3d/models/task_modules/__init__.py
mmdet3d/models/task_modules/__init__.py
+1
-0
mmdet3d/models/task_modules/assigners/max_3d_iou_assigner.py
mmdet3d/models/task_modules/assigners/max_3d_iou_assigner.py
+1
-1
mmdet3d/models/task_modules/coders/centerpoint_bbox_coders.py
...t3d/models/task_modules/coders/centerpoint_bbox_coders.py
+1
-1
mmdet3d/models/task_modules/coders/delta_xyzwhlr_bbox_coder.py
...3d/models/task_modules/coders/delta_xyzwhlr_bbox_coder.py
+1
-1
mmdet3d/models/task_modules/coders/fcos3d_bbox_coder.py
mmdet3d/models/task_modules/coders/fcos3d_bbox_coder.py
+1
-1
mmdet3d/models/task_modules/coders/monoflex_bbox_coder.py
mmdet3d/models/task_modules/coders/monoflex_bbox_coder.py
+1
-1
mmdet3d/models/task_modules/coders/partial_bin_based_bbox_coder.py
...odels/task_modules/coders/partial_bin_based_bbox_coder.py
+1
-1
mmdet3d/models/task_modules/coders/point_xyzwhlr_bbox_coder.py
...3d/models/task_modules/coders/point_xyzwhlr_bbox_coder.py
+1
-1
mmdet3d/models/task_modules/coders/smoke_bbox_coder.py
mmdet3d/models/task_modules/coders/smoke_bbox_coder.py
+1
-1
mmdet3d/models/task_modules/samplers/__init__.py
mmdet3d/models/task_modules/samplers/__init__.py
+1
-0
mmdet3d/models/task_modules/samplers/pseudosample.py
mmdet3d/models/task_modules/samplers/pseudosample.py
+1
-1
mmdet3d/structures/det3d_data_sample.py
mmdet3d/structures/det3d_data_sample.py
+1
-1
No files found.
mmdet3d/models/roi_heads/bbox_heads/h3d_bbox_head.py
View file @
1f9eb6c8
...
@@ -3,6 +3,7 @@ from typing import Dict, List, Optional, Tuple
...
@@ -3,6 +3,7 @@ from typing import Dict, List, Optional, Tuple
import
torch
import
torch
from
mmcv.cnn
import
ConvModule
from
mmcv.cnn
import
ConvModule
from
mmdet.models.utils
import
multi_apply
from
mmengine.model
import
BaseModule
from
mmengine.model
import
BaseModule
from
mmengine.structures
import
InstanceData
from
mmengine.structures
import
InstanceData
from
torch
import
Tensor
from
torch
import
Tensor
...
@@ -15,7 +16,6 @@ from mmdet3d.models.losses import chamfer_distance
...
@@ -15,7 +16,6 @@ from mmdet3d.models.losses import chamfer_distance
from
mmdet3d.registry
import
MODELS
,
TASK_UTILS
from
mmdet3d.registry
import
MODELS
,
TASK_UTILS
from
mmdet3d.structures
import
(
BaseInstance3DBoxes
,
DepthInstance3DBoxes
,
from
mmdet3d.structures
import
(
BaseInstance3DBoxes
,
DepthInstance3DBoxes
,
Det3DDataSample
)
Det3DDataSample
)
from
mmdet.models.utils
import
multi_apply
@
MODELS
.
register_module
()
@
MODELS
.
register_module
()
...
...
mmdet3d/models/roi_heads/bbox_heads/parta2_bbox_head.py
View file @
1f9eb6c8
...
@@ -4,6 +4,7 @@ from typing import Dict, List, Tuple
...
@@ -4,6 +4,7 @@ from typing import Dict, List, Tuple
import
numpy
as
np
import
numpy
as
np
import
torch
import
torch
from
mmcv.cnn
import
ConvModule
from
mmcv.cnn
import
ConvModule
from
mmdet.models.utils
import
multi_apply
from
mmengine.model
import
normal_init
from
mmengine.model
import
normal_init
from
mmengine.structures
import
InstanceData
from
mmengine.structures
import
InstanceData
from
torch
import
Tensor
from
torch
import
Tensor
...
@@ -11,7 +12,6 @@ from torch import Tensor
...
@@ -11,7 +12,6 @@ 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
import
InstanceList
from
mmdet.models.utils
import
multi_apply
if
IS_SPCONV2_AVAILABLE
:
if
IS_SPCONV2_AVAILABLE
:
from
spconv.pytorch
import
(
SparseConvTensor
,
SparseMaxPool3d
,
from
spconv.pytorch
import
(
SparseConvTensor
,
SparseMaxPool3d
,
...
...
mmdet3d/models/roi_heads/bbox_heads/point_rcnn_bbox_head.py
View file @
1f9eb6c8
...
@@ -6,6 +6,7 @@ import torch
...
@@ -6,6 +6,7 @@ import torch
import
torch.nn
as
nn
import
torch.nn
as
nn
from
mmcv.cnn
import
ConvModule
from
mmcv.cnn
import
ConvModule
from
mmcv.cnn.bricks
import
build_conv_layer
from
mmcv.cnn.bricks
import
build_conv_layer
from
mmdet.models.utils
import
multi_apply
from
mmengine.model
import
BaseModule
,
normal_init
from
mmengine.model
import
BaseModule
,
normal_init
from
mmengine.structures
import
InstanceData
from
mmengine.structures
import
InstanceData
from
torch
import
Tensor
from
torch
import
Tensor
...
@@ -16,7 +17,6 @@ from mmdet3d.registry import MODELS, TASK_UTILS
...
@@ -16,7 +17,6 @@ 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
import
InstanceList
,
SamplingResultList
from
mmdet.models.utils
import
multi_apply
@
MODELS
.
register_module
()
@
MODELS
.
register_module
()
...
...
mmdet3d/models/roi_heads/mask_heads/pointwise_semantic_head.py
View file @
1f9eb6c8
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
from
typing
import
Dict
,
Optional
,
Tuple
from
typing
import
Dict
,
Optional
,
Tuple
import
torch
import
torch
from
mmdet.models.utils
import
multi_apply
from
mmengine.model
import
BaseModule
from
mmengine.model
import
BaseModule
from
torch
import
Tensor
from
torch
import
Tensor
from
torch
import
nn
as
nn
from
torch
import
nn
as
nn
...
@@ -10,7 +11,6 @@ from torch.nn import functional as F
...
@@ -10,7 +11,6 @@ from torch.nn import functional as F
from
mmdet3d.registry
import
MODELS
from
mmdet3d.registry
import
MODELS
from
mmdet3d.structures.bbox_3d
import
BaseInstance3DBoxes
,
rotation_3d_in_axis
from
mmdet3d.structures.bbox_3d
import
BaseInstance3DBoxes
,
rotation_3d_in_axis
from
mmdet3d.utils
import
InstanceList
from
mmdet3d.utils
import
InstanceList
from
mmdet.models.utils
import
multi_apply
@
MODELS
.
register_module
()
@
MODELS
.
register_module
()
...
...
mmdet3d/models/roi_heads/mask_heads/primitive_head.py
View file @
1f9eb6c8
...
@@ -4,6 +4,7 @@ from typing import Dict, List, Optional, Tuple
...
@@ -4,6 +4,7 @@ from typing import Dict, List, Optional, Tuple
import
torch
import
torch
from
mmcv.cnn
import
ConvModule
from
mmcv.cnn
import
ConvModule
from
mmcv.ops
import
furthest_point_sample
from
mmcv.ops
import
furthest_point_sample
from
mmdet.models.utils
import
multi_apply
from
mmengine.model
import
BaseModule
from
mmengine.model
import
BaseModule
from
mmengine.structures
import
InstanceData
from
mmengine.structures
import
InstanceData
from
torch
import
nn
as
nn
from
torch
import
nn
as
nn
...
@@ -13,7 +14,6 @@ from mmdet3d.models.layers import VoteModule, build_sa_module
...
@@ -13,7 +14,6 @@ from mmdet3d.models.layers import VoteModule, build_sa_module
from
mmdet3d.registry
import
MODELS
from
mmdet3d.registry
import
MODELS
from
mmdet3d.structures
import
Det3DDataSample
from
mmdet3d.structures
import
Det3DDataSample
from
mmdet3d.structures.bbox_3d
import
BaseInstance3DBoxes
from
mmdet3d.structures.bbox_3d
import
BaseInstance3DBoxes
from
mmdet.models.utils
import
multi_apply
@
MODELS
.
register_module
()
@
MODELS
.
register_module
()
...
...
mmdet3d/models/roi_heads/part_aggregation_roi_head.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
from
typing
import
Dict
,
List
,
Tuple
from
typing
import
Dict
,
List
,
Tuple
from
mmdet.models.task_modules
import
AssignResult
,
SamplingResult
from
mmengine
import
ConfigDict
from
mmengine
import
ConfigDict
from
torch
import
Tensor
from
torch
import
Tensor
from
torch.nn
import
functional
as
F
from
torch.nn
import
functional
as
F
...
@@ -8,7 +9,6 @@ from torch.nn import functional as F
...
@@ -8,7 +9,6 @@ from torch.nn import functional as F
from
mmdet3d.registry
import
MODELS
from
mmdet3d.registry
import
MODELS
from
mmdet3d.structures
import
bbox3d2roi
from
mmdet3d.structures
import
bbox3d2roi
from
mmdet3d.utils
import
InstanceList
from
mmdet3d.utils
import
InstanceList
from
mmdet.models.task_modules
import
AssignResult
,
SamplingResult
from
...structures.det3d_data_sample
import
SampleList
from
...structures.det3d_data_sample
import
SampleList
from
.base_3droi_head
import
Base3DRoIHead
from
.base_3droi_head
import
Base3DRoIHead
...
...
mmdet3d/models/roi_heads/point_rcnn_roi_head.py
View file @
1f9eb6c8
...
@@ -2,13 +2,13 @@
...
@@ -2,13 +2,13 @@
from
typing
import
Dict
,
Optional
from
typing
import
Dict
,
Optional
import
torch
import
torch
from
mmdet.models.task_modules
import
AssignResult
from
torch
import
Tensor
from
torch
import
Tensor
from
torch.nn
import
functional
as
F
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
import
InstanceList
,
SampleList
from
mmdet.models.task_modules
import
AssignResult
from
.base_3droi_head
import
Base3DRoIHead
from
.base_3droi_head
import
Base3DRoIHead
...
...
mmdet3d/models/roi_heads/roi_extractors/__init__.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
from
mmdet.models.roi_heads.roi_extractors
import
SingleRoIExtractor
from
mmdet.models.roi_heads.roi_extractors
import
SingleRoIExtractor
from
.single_roiaware_extractor
import
Single3DRoIAwareExtractor
from
.single_roiaware_extractor
import
Single3DRoIAwareExtractor
from
.single_roipoint_extractor
import
Single3DRoIPointExtractor
from
.single_roipoint_extractor
import
Single3DRoIPointExtractor
...
...
mmdet3d/models/task_modules/__init__.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
from
mmdet.models.task_modules
import
AssignResult
,
BaseAssigner
from
mmdet.models.task_modules
import
AssignResult
,
BaseAssigner
from
.anchor
import
(
ANCHOR_GENERATORS
,
PRIOR_GENERATORS
,
from
.anchor
import
(
ANCHOR_GENERATORS
,
PRIOR_GENERATORS
,
AlignedAnchor3DRangeGenerator
,
AlignedAnchor3DRangeGenerator
,
AlignedAnchor3DRangeGeneratorPerCls
,
AlignedAnchor3DRangeGeneratorPerCls
,
...
...
mmdet3d/models/task_modules/assigners/max_3d_iou_assigner.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
from
typing
import
Optional
,
Union
from
typing
import
Optional
,
Union
from
mmdet.models.task_modules
import
AssignResult
,
MaxIoUAssigner
from
mmengine.structures
import
InstanceData
from
mmengine.structures
import
InstanceData
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
AssignResult
,
MaxIoUAssigner
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/coders/centerpoint_bbox_coders.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
torch
import
torch
from
mmdet.models.task_modules
import
BaseBBoxCoder
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
BaseBBoxCoder
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/coders/delta_xyzwhlr_bbox_coder.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
torch
import
torch
from
mmdet.models.task_modules
import
BaseBBoxCoder
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
BaseBBoxCoder
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/coders/fcos3d_bbox_coder.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
numpy
as
np
import
numpy
as
np
import
torch
import
torch
from
mmdet.models.task_modules
import
BaseBBoxCoder
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.structures.bbox_3d
import
limit_period
from
mmdet3d.structures.bbox_3d
import
limit_period
from
mmdet.models.task_modules
import
BaseBBoxCoder
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/coders/monoflex_bbox_coder.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
numpy
as
np
import
numpy
as
np
import
torch
import
torch
from
mmdet.models.task_modules
import
BaseBBoxCoder
from
torch.nn
import
functional
as
F
from
torch.nn
import
functional
as
F
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
BaseBBoxCoder
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/coders/partial_bin_based_bbox_coder.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
numpy
as
np
import
numpy
as
np
import
torch
import
torch
from
mmdet.models.task_modules
import
BaseBBoxCoder
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
BaseBBoxCoder
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/coders/point_xyzwhlr_bbox_coder.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
numpy
as
np
import
numpy
as
np
import
torch
import
torch
from
mmdet.models.task_modules
import
BaseBBoxCoder
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
BaseBBoxCoder
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/coders/smoke_bbox_coder.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
numpy
as
np
import
numpy
as
np
import
torch
import
torch
from
mmdet.models.task_modules
import
BaseBBoxCoder
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
BaseBBoxCoder
@
TASK_UTILS
.
register_module
()
@
TASK_UTILS
.
register_module
()
...
...
mmdet3d/models/task_modules/samplers/__init__.py
View file @
1f9eb6c8
...
@@ -4,6 +4,7 @@ from mmdet.models.task_modules.samplers import (BaseSampler, CombinedSampler,
...
@@ -4,6 +4,7 @@ from mmdet.models.task_modules.samplers import (BaseSampler, CombinedSampler,
IoUBalancedNegSampler
,
IoUBalancedNegSampler
,
OHEMSampler
,
RandomSampler
,
OHEMSampler
,
RandomSampler
,
SamplingResult
)
SamplingResult
)
from
.iou_neg_piecewise_sampler
import
IoUNegPiecewiseSampler
from
.iou_neg_piecewise_sampler
import
IoUNegPiecewiseSampler
from
.pseudosample
import
PseudoSampler
from
.pseudosample
import
PseudoSampler
...
...
mmdet3d/models/task_modules/samplers/pseudosample.py
View file @
1f9eb6c8
# Copyright (c) OpenMMLab. All rights reserved.
# Copyright (c) OpenMMLab. All rights reserved.
import
torch
import
torch
from
mmdet.models.task_modules
import
AssignResult
from
mmengine.structures
import
InstanceData
from
mmengine.structures
import
InstanceData
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet3d.registry
import
TASK_UTILS
from
mmdet.models.task_modules
import
AssignResult
from
..samplers
import
BaseSampler
,
SamplingResult
from
..samplers
import
BaseSampler
,
SamplingResult
...
...
mmdet3d/structures/det3d_data_sample.py
View file @
1f9eb6c8
...
@@ -2,9 +2,9 @@
...
@@ -2,9 +2,9 @@
from
typing
import
Dict
,
List
,
Optional
,
Tuple
,
Union
from
typing
import
Dict
,
List
,
Optional
,
Tuple
,
Union
import
torch
import
torch
from
mmdet.structures
import
DetDataSample
from
mmengine.structures
import
InstanceData
from
mmengine.structures
import
InstanceData
from
mmdet.structures
import
DetDataSample
from
.point_data
import
PointData
from
.point_data
import
PointData
...
...
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment