"examples/vscode:/vscode.git/clone" did not exist on "4edfa95d89d1cfd02e1f1777e515b2243d2f4518"
Unverified Commit b1deeb53 authored by Zongbao Feng's avatar Zongbao Feng Committed by GitHub
Browse files

upgrade to build_anchor_generator (#941)

* visuliaztion typos

* fix to visualization

* fixed lint errors by pre-commit

* upgrade to build_anchor_generator

* fixed  isort message
parent 234bf975
# Copyright (c) OpenMMLab. All rights reserved. # Copyright (c) OpenMMLab. All rights reserved.
from mmdet.core.anchor import build_anchor_generator from mmdet.core.anchor import build_prior_generator
from .anchor_3d_generator import (AlignedAnchor3DRangeGenerator, from .anchor_3d_generator import (AlignedAnchor3DRangeGenerator,
AlignedAnchor3DRangeGeneratorPerCls, AlignedAnchor3DRangeGeneratorPerCls,
Anchor3DRangeGenerator) Anchor3DRangeGenerator)
__all__ = [ __all__ = [
'AlignedAnchor3DRangeGenerator', 'Anchor3DRangeGenerator', 'AlignedAnchor3DRangeGenerator', 'Anchor3DRangeGenerator',
'build_anchor_generator', 'AlignedAnchor3DRangeGeneratorPerCls' 'build_prior_generator', 'AlignedAnchor3DRangeGeneratorPerCls'
] ]
...@@ -6,8 +6,8 @@ from torch import nn as nn ...@@ -6,8 +6,8 @@ from torch import nn as nn
from mmdet3d.core import (PseudoSampler, box3d_multiclass_nms, limit_period, from mmdet3d.core import (PseudoSampler, box3d_multiclass_nms, limit_period,
xywhr2xyxyr) xywhr2xyxyr)
from mmdet.core import (build_anchor_generator, build_assigner, from mmdet.core import (build_assigner, build_bbox_coder,
build_bbox_coder, build_sampler, multi_apply) build_prior_generator, build_sampler, multi_apply)
from mmdet.models import HEADS from mmdet.models import HEADS
from ..builder import build_loss from ..builder import build_loss
from .train_mixins import AnchorTrainMixin from .train_mixins import AnchorTrainMixin
...@@ -84,7 +84,7 @@ class Anchor3DHead(BaseModule, AnchorTrainMixin): ...@@ -84,7 +84,7 @@ class Anchor3DHead(BaseModule, AnchorTrainMixin):
self.fp16_enabled = False self.fp16_enabled = False
# build anchor generator # build anchor generator
self.anchor_generator = build_anchor_generator(anchor_generator) self.anchor_generator = build_prior_generator(anchor_generator)
# In 3D detection, the anchor stride is connected with anchor size # In 3D detection, the anchor stride is connected with anchor size
self.num_anchors = self.anchor_generator.num_base_anchors self.num_anchors = self.anchor_generator.num_base_anchors
# build box coder # build box coder
......
# Copyright (c) OpenMMLab. All rights reserved. # Copyright (c) OpenMMLab. All rights reserved.
import torch import torch
from mmdet3d.core import bbox3d2result, build_anchor_generator from mmdet3d.core import bbox3d2result, build_prior_generator
from mmdet3d.models.fusion_layers.point_fusion import point_sample from mmdet3d.models.fusion_layers.point_fusion import point_sample
from mmdet.models import DETECTORS, build_backbone, build_head, build_neck from mmdet.models import DETECTORS, build_backbone, build_head, build_neck
from mmdet.models.detectors import BaseDetector from mmdet.models.detectors import BaseDetector
...@@ -30,7 +30,7 @@ class ImVoxelNet(BaseDetector): ...@@ -30,7 +30,7 @@ class ImVoxelNet(BaseDetector):
bbox_head.update(test_cfg=test_cfg) bbox_head.update(test_cfg=test_cfg)
self.bbox_head = build_head(bbox_head) self.bbox_head = build_head(bbox_head)
self.n_voxels = n_voxels self.n_voxels = n_voxels
self.anchor_generator = build_anchor_generator(anchor_generator) self.anchor_generator = build_prior_generator(anchor_generator)
self.train_cfg = train_cfg self.train_cfg = train_cfg
self.test_cfg = test_cfg self.test_cfg = test_cfg
......
...@@ -7,7 +7,7 @@ CommandLine: ...@@ -7,7 +7,7 @@ CommandLine:
""" """
import torch import torch
from mmdet3d.core.anchor import build_anchor_generator from mmdet3d.core.anchor import build_prior_generator
def test_anchor_3d_range_generator(): def test_anchor_3d_range_generator():
...@@ -26,7 +26,7 @@ def test_anchor_3d_range_generator(): ...@@ -26,7 +26,7 @@ def test_anchor_3d_range_generator():
rotations=[0, 1.57], rotations=[0, 1.57],
reshape_out=False) reshape_out=False)
anchor_generator = build_anchor_generator(anchor_generator_cfg) anchor_generator = build_prior_generator(anchor_generator_cfg)
repr_str = repr(anchor_generator) repr_str = repr(anchor_generator)
expected_repr_str = 'Anchor3DRangeGenerator(anchor_range=' \ expected_repr_str = 'Anchor3DRangeGenerator(anchor_range=' \
'[[0, -39.68, -0.6, 70.4, 39.68, -0.6], ' \ '[[0, -39.68, -0.6, 70.4, 39.68, -0.6], ' \
...@@ -65,7 +65,7 @@ def test_aligned_anchor_generator(): ...@@ -65,7 +65,7 @@ def test_aligned_anchor_generator():
reshape_out=True) reshape_out=True)
featmap_sizes = [(256, 256), (128, 128), (64, 64)] featmap_sizes = [(256, 256), (128, 128), (64, 64)]
anchor_generator = build_anchor_generator(anchor_generator_cfg) anchor_generator = build_prior_generator(anchor_generator_cfg)
assert anchor_generator.num_base_anchors == 8 assert anchor_generator.num_base_anchors == 8
# check base anchors # check base anchors
...@@ -200,7 +200,7 @@ def test_aligned_anchor_generator_per_cls(): ...@@ -200,7 +200,7 @@ def test_aligned_anchor_generator_per_cls():
reshape_out=False) reshape_out=False)
featmap_sizes = [(100, 100), (50, 50)] featmap_sizes = [(100, 100), (50, 50)]
anchor_generator = build_anchor_generator(anchor_generator_cfg) anchor_generator = build_prior_generator(anchor_generator_cfg)
# check base anchors # check base anchors
expected_grid_anchors = [[ expected_grid_anchors = [[
......
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