Skip to content

Commit 6c03a97

Browse files
authored
Release v1.1.0rc1
Release v1.1.0rc1
2 parents 9611c2d + ca42c31 commit 6c03a97

File tree

174 files changed

+5973
-2316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+5973
-2316
lines changed

.circleci/test.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
type: string
3737
torchvision:
3838
type: string
39-
mmcv:
40-
type: string
4139
docker:
4240
- image: cimg/python:<< parameters.python >>
4341
resource_class: large
@@ -62,7 +60,8 @@ jobs:
6260
name: Install mmdet3d dependencies
6361
command: |
6462
python -m pip install git+ssh://git@github.com/open-mmlab/mmengine.git@main
65-
python -m pip install << parameters.mmcv >>
63+
python -m pip install -U openmim
64+
python -m mim install 'mmcv >= 2.0.0rc1'
6665
python -m pip install git+ssh://git@github.com/open-mmlab/mmdetection.git@dev-3.x
6766
python -m pip install -r requirements.txt
6867
- run:
@@ -85,8 +84,6 @@ jobs:
8584
cudnn:
8685
type: integer
8786
default: 7
88-
mmcv:
89-
type: string
9087
machine:
9188
image: ubuntu-2004-cuda-11.4:202110-01
9289
# docker_layer_caching: true
@@ -108,7 +105,8 @@ jobs:
108105
name: Install mmdet3d dependencies
109106
command: |
110107
docker exec mmdet3d pip install -e /mmengine
111-
docker exec mmdet3d pip install << parameters.mmcv >>
108+
docker exec mmdet3d pip install -U openmim
109+
docker exec mmdet3d mim install 'mmcv >= 2.0.0rc1'
112110
docker exec mmdet3d pip install -e /mmdetection
113111
docker exec mmdet3d pip install -r requirements.txt
114112
- run:
@@ -144,16 +142,14 @@ workflows:
144142
name: minimum_version_cpu
145143
torch: 1.6.0
146144
torchvision: 0.7.0
147-
python: 3.6.9 # The lowest python 3.6.x version available on CircleCI images
148-
mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cpu/torch1.6.0/mmcv_full-2.0.0rc0-cp36-cp36m-manylinux1_x86_64.whl
145+
python: 3.7.4
149146
requires:
150147
- lint
151148
- build_cpu:
152149
name: maximum_version_cpu
153150
torch: 1.9.0
154151
torchvision: 0.10.0
155152
python: 3.9.0
156-
mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cpu/torch1.9.0/mmcv_full-2.0.0rc0-cp39-cp39-manylinux1_x86_64.whl
157153
requires:
158154
- minimum_version_cpu
159155
- hold:
@@ -166,7 +162,6 @@ workflows:
166162
# Use double quotation mark to explicitly specify its type
167163
# as string instead of number
168164
cuda: "10.2"
169-
mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cu102/torch1.8.0/mmcv_full-2.0.0rc0-cp37-cp37m-manylinux1_x86_64.whl
170165
requires:
171166
- hold
172167
merge_stage_test:
@@ -179,7 +174,6 @@ workflows:
179174
torch: 1.6.0
180175
# Use double quotation mark to explicitly specify its type
181176
# as string instead of number
182-
mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cu101/torch1.6.0/mmcv_full-2.0.0rc0-cp37-cp37m-manylinux1_x86_64.whl
183177
cuda: "10.1"
184178
filters:
185179
branches:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,4 @@ data/sunrgbd/OFFICIAL_SUNRGBD/
133133

134134
# Waymo evaluation
135135
mmdet3d/core/evaluation/waymo_utils/compute_detection_metrics_main
136+
mmdet3d/core/evaluation/waymo_utils/compute_detection_let_metrics_main

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
repos:
22
- repo: https://github.com/PyCQA/flake8
3-
rev: 3.8.3
3+
rev: 5.0.4
44
hooks:
55
- id: flake8
66
- repo: https://github.com/PyCQA/isort
77
rev: 5.10.1
88
hooks:
99
- id: isort
1010
- repo: https://github.com/pre-commit/mirrors-yapf
11-
rev: v0.30.0
11+
rev: v0.32.0
1212
hooks:
1313
- id: yapf
1414
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v3.1.0
15+
rev: v4.3.0
1616
hooks:
1717
- id: trailing-whitespace
1818
- id: check-yaml
@@ -25,7 +25,7 @@ repos:
2525
- id: mixed-line-ending
2626
args: ["--fix=lf"]
2727
- repo: https://github.com/codespell-project/codespell
28-
rev: v2.1.0
28+
rev: v2.2.1
2929
hooks:
3030
- id: codespell
3131
- repo: https://github.com/executablebooks/mdformat

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ This project is released under the [Apache 2.0 license](LICENSE).
8282

8383
## Changelog
8484

85-
We are excited to announce the release of MMDetection3D 1.1.0rc0.
86-
87-
MMDet3D 1.1 unifies the interfaces of dataset, models, evaluation, and visualization with faster training and testing speed.
85+
**1.1.0rc1** was released in 11/10/2022.
8886

8987
Please refer to [changelog.md](docs/en/notes/changelog.md) for details and release history.
9088

README_zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MMDetection3D 是一个基于 PyTorch 的目标检测开源工具箱, 下一代
8282

8383
## 更新日志
8484

85-
MMDetection3D 1.1.0rc0,MMDet3D 在 OpenMMLab 2.0 项目中的首个版本发布。
85+
我们在 2022.10.11 发布了 **1.1.0rc1** 版本.
8686

8787
更多细节和版本发布历史可以参考[changelog.md](docs/en/notes/changelog.md).
8888

configs/_base_/datasets/kitti-3d-3class.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
# please keep its loading function consistent with test_pipeline (e.g. client)
6868
eval_pipeline = [
6969
dict(type='LoadPointsFromFile', coord_type='LIDAR', load_dim=4, use_dim=4),
70-
dict(type='Pack3DDetInputs', keys=['points']),
70+
dict(type='Pack3DDetInputs', keys=['points'])
7171
]
7272
train_dataloader = dict(
7373
batch_size=6,
@@ -126,3 +126,7 @@
126126
ann_file=data_root + 'kitti_infos_val.pkl',
127127
metric='bbox')
128128
test_evaluator = val_evaluator
129+
130+
vis_backends = [dict(type='LocalVisBackend')]
131+
visualizer = dict(
132+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/kitti-3d-car.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,7 @@
124124
ann_file=data_root + 'kitti_infos_val.pkl',
125125
metric='bbox')
126126
test_evaluator = val_evaluator
127+
128+
vis_backends = [dict(type='LocalVisBackend')]
129+
visualizer = dict(
130+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/kitti-mono3d.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
dict(type='Resize', scale=(1242, 375), keep_ratio=True),
3636
dict(type='Pack3DDetInputs', keys=['img'])
3737
]
38+
eval_pipeline = [
39+
dict(type='LoadImageFromFileMono3D'),
40+
dict(type='Pack3DDetInputs', keys=['img'])
41+
]
3842

3943
train_dataloader = dict(
4044
batch_size=2,
@@ -78,3 +82,7 @@
7882
pred_box_type_3d='Camera')
7983

8084
test_evaluator = val_evaluator
85+
86+
vis_backends = [dict(type='LocalVisBackend')]
87+
visualizer = dict(
88+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/lyft-3d.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,7 @@
124124
type='LyftMetric',
125125
ann_file=data_root + 'lyft_infos_val.pkl',
126126
metric='bbox')
127+
128+
vis_backends = [dict(type='LocalVisBackend')]
129+
visualizer = dict(
130+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/nus-3d.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,7 @@
126126
ann_file=data_root + 'nuscenes_infos_val.pkl',
127127
metric='bbox')
128128
test_evaluator = val_evaluator
129+
130+
vis_backends = [dict(type='LocalVisBackend')]
131+
visualizer = dict(
132+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/nus-mono3d.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
CAM_BACK_RIGHT='samples/CAM_BACK_RIGHT',
6666
CAM_BACK_LEFT='samples/CAM_BACK_LEFT'),
6767
ann_file='nuscenes_infos_train.pkl',
68-
task='mono3d',
68+
task='mono_det',
6969
pipeline=train_pipeline,
7070
metainfo=metainfo,
7171
modality=input_modality,
@@ -92,7 +92,7 @@
9292
CAM_BACK_RIGHT='samples/CAM_BACK_RIGHT',
9393
CAM_BACK_LEFT='samples/CAM_BACK_LEFT'),
9494
ann_file='nuscenes_infos_val.pkl',
95-
task='mono3d',
95+
task='mono_det',
9696
pipeline=test_pipeline,
9797
modality=input_modality,
9898
metainfo=metainfo,
@@ -108,3 +108,7 @@
108108
metric='bbox')
109109

110110
test_evaluator = val_evaluator
111+
112+
vis_backends = [dict(type='LocalVisBackend')]
113+
visualizer = dict(
114+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/s3dis-seg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,7 @@
142142

143143
val_evaluator = dict(type='SegMetric')
144144
test_evaluator = val_evaluator
145+
146+
vis_backends = [dict(type='LocalVisBackend')]
147+
visualizer = dict(
148+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/scannet-3d.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,7 @@
125125
box_type_3d='Depth'))
126126
val_evaluator = dict(type='IndoorMetric')
127127
test_evaluator = val_evaluator
128+
129+
vis_backends = [dict(type='LocalVisBackend')]
130+
visualizer = dict(
131+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/scannet-seg.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,7 @@
137137

138138
val_evaluator = dict(type='SegMetric')
139139
test_evaluator = val_evaluator
140+
141+
vis_backends = [dict(type='LocalVisBackend')]
142+
visualizer = dict(
143+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/sunrgbd-3d.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,7 @@
111111
box_type_3d='Depth'))
112112
val_evaluator = dict(type='IndoorMetric')
113113
test_evaluator = val_evaluator
114+
115+
vis_backends = [dict(type='LocalVisBackend')]
116+
visualizer = dict(
117+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/waymoD5-3d-3class.py

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22
# D5 in the config name means the whole dataset is divided into 5 folds
33
# We only use one fold for efficient experiments
44
dataset_type = 'WaymoDataset'
5+
# data_root = 's3://openmmlab/datasets/detection3d/waymo/kitti_format/'
56
data_root = 'data/waymo/kitti_format/'
67
file_client_args = dict(backend='disk')
78
# Uncomment the following if use ceph or other file clients.
89
# See https://mmcv.readthedocs.io/en/latest/api.html#mmcv.fileio.FileClient
910
# for more details.
1011
# file_client_args = dict(
11-
# backend='petrel', path_mapping=dict(data='s3://waymo_data/'))
12+
# backend='petrel',
13+
# path_mapping={
14+
# './data/waymo': 's3://openmmlab/datasets/detection3d/waymo',
15+
# 'data/waymo': 's3://openmmlab/datasets/detection3d/waymo'
16+
# })
1217

1318
class_names = ['Car', 'Pedestrian', 'Cyclist']
1419
metainfo = dict(CLASSES=class_names)
@@ -33,7 +38,7 @@
3338
train_pipeline = [
3439
dict(type='LoadPointsFromFile', coord_type='LIDAR', load_dim=6, use_dim=5),
3540
dict(type='LoadAnnotations3D', with_bbox_3d=True, with_label_3d=True),
36-
dict(type='ObjectSample', db_sampler=db_sampler),
41+
# dict(type='ObjectSample', db_sampler=db_sampler),
3742
dict(
3843
type='RandomFlip3D',
3944
sync_2d=False,
@@ -51,7 +56,12 @@
5156
keys=['points', 'gt_bboxes_3d', 'gt_labels_3d'])
5257
]
5358
test_pipeline = [
54-
dict(type='LoadPointsFromFile', coord_type='LIDAR', load_dim=6, use_dim=5),
59+
dict(
60+
type='LoadPointsFromFile',
61+
coord_type='LIDAR',
62+
load_dim=6,
63+
use_dim=5,
64+
file_client_args=file_client_args),
5565
dict(
5666
type='MultiScaleFlipAug3D',
5767
img_scale=(1333, 800),
@@ -88,7 +98,8 @@
8898
type=dataset_type,
8999
data_root=data_root,
90100
ann_file='waymo_infos_train.pkl',
91-
data_prefix=dict(pts='training/velodyne'),
101+
data_prefix=dict(
102+
pts='training/velodyne', sweeps='training/velodyne'),
92103
pipeline=train_pipeline,
93104
modality=input_modality,
94105
test_mode=False,
@@ -97,7 +108,8 @@
97108
# and box_type_3d='Depth' in sunrgbd and scannet dataset.
98109
box_type_3d='LiDAR',
99110
# load one frame every five frames
100-
load_interval=5)))
111+
load_interval=5,
112+
file_client_args=file_client_args)))
101113
val_dataloader = dict(
102114
batch_size=1,
103115
num_workers=1,
@@ -107,13 +119,14 @@
107119
dataset=dict(
108120
type=dataset_type,
109121
data_root=data_root,
110-
data_prefix=dict(pts='training/velodyne'),
122+
data_prefix=dict(pts='training/velodyne', sweeps='training/velodyne'),
111123
ann_file='waymo_infos_val.pkl',
112124
pipeline=eval_pipeline,
113125
modality=input_modality,
114126
test_mode=True,
115127
metainfo=metainfo,
116-
box_type_3d='LiDAR'))
128+
box_type_3d='LiDAR',
129+
file_client_args=file_client_args))
117130

118131
test_dataloader = dict(
119132
batch_size=1,
@@ -124,17 +137,23 @@
124137
dataset=dict(
125138
type=dataset_type,
126139
data_root=data_root,
127-
data_prefix=dict(pts='training/velodyne'),
140+
data_prefix=dict(pts='training/velodyne', sweeps='training/velodyne'),
128141
ann_file='waymo_infos_val.pkl',
129142
pipeline=eval_pipeline,
130143
modality=input_modality,
131144
test_mode=True,
132145
metainfo=metainfo,
133-
box_type_3d='LiDAR'))
146+
box_type_3d='LiDAR',
147+
file_client_args=file_client_args))
134148

135149
val_evaluator = dict(
136150
type='WaymoMetric',
137151
ann_file='./data/waymo/kitti_format/waymo_infos_val.pkl',
138152
waymo_bin_file='./data/waymo/waymo_format/gt.bin',
139-
data_root='./data/waymo/waymo_format')
153+
data_root='./data/waymo/waymo_format',
154+
file_client_args=file_client_args)
140155
test_evaluator = val_evaluator
156+
157+
vis_backends = [dict(type='LocalVisBackend')]
158+
visualizer = dict(
159+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

configs/_base_/datasets/waymoD5-3d-car.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
type=dataset_type,
8787
data_root=data_root,
8888
ann_file='waymo_infos_train.pkl',
89-
data_prefix=dict(pts='training/velodyne'),
89+
data_prefix=dict(
90+
pts='training/velodyne', sweeps='training/velodyne'),
9091
pipeline=train_pipeline,
9192
modality=input_modality,
9293
test_mode=False,
@@ -105,7 +106,7 @@
105106
dataset=dict(
106107
type=dataset_type,
107108
data_root=data_root,
108-
data_prefix=dict(pts='training/velodyne'),
109+
data_prefix=dict(pts='training/velodyne', sweeps='training/velodyne'),
109110
ann_file='waymo_infos_val.pkl',
110111
pipeline=eval_pipeline,
111112
modality=input_modality,
@@ -122,7 +123,7 @@
122123
dataset=dict(
123124
type=dataset_type,
124125
data_root=data_root,
125-
data_prefix=dict(pts='training/velodyne'),
126+
data_prefix=dict(pts='training/velodyne', sweeps='training/velodyne'),
126127
ann_file='waymo_infos_val.pkl',
127128
pipeline=eval_pipeline,
128129
modality=input_modality,
@@ -136,3 +137,7 @@
136137
waymo_bin_file='./data/waymo/waymo_format/gt.bin',
137138
data_root='./data/waymo/waymo_format')
138139
test_evaluator = val_evaluator
140+
141+
vis_backends = [dict(type='LocalVisBackend')]
142+
visualizer = dict(
143+
type='Det3DLocalVisualizer', vis_backends=vis_backends, name='visualizer')

0 commit comments

Comments
 (0)