[Refactor] Update configs name (#1757)

* fix cfg name * update cfg name * fix cfg * fix comments * fix comment * fix comments

[Refactor] Update configs name (#1757)
* fix cfg name * update cfg name * fix cfg * fix comments * fix comment * fix comments
f885d28a · VVsssssk · GitHub · ea22f8ec · f885d28a · f885d28a
Unverified Commit f885d28a authored Aug 30, 2022 by VVsssssk Committed by GitHub Aug 30, 2022
20 changed files
--- a/.dev_scripts/test_benchmark.sh
+++ b/.dev_scripts/test_benchmark.sh
--- a/.dev_scripts/train_benchmark.sh
+++ b/.dev_scripts/train_benchmark.sh
--- a/configs/3dssd/3dssd_4x4_kitti-3d-car.py
+++ b/configs/3dssd/3dssd_4x4_kitti-3d-car.py
--- a/configs/3dssd/README.md
+++ b/configs/3dssd/README.md
@@ -27,9 +27,9 @@ Some settings in our implementation are different from the [official implementat
 ### KITTI
-|                   Backbone                    | Class | Lr schd | Mem (GB) | Inf time (fps) |           mAP            |                                                                                                                                                Download                                                                                                                                                |
+|                    Backbone                    | Class | Lr schd | Mem (GB) | Inf time (fps) |           mAP            |                                                                                                                                                Download                                                                                                                                                |
-| :-------------------------------------------: | :---: | :-----: | :------: | :------------: | :----------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
+| :--------------------------------------------: | :---: | :-----: | :------: | :------------: | :----------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-| [PointNet2SAMSG](./3dssd_4x4_kitti-3d-car.py) |  Car  |   72e   |   4.7    |                | 78.58(81.27)<sup>1</sup> | [model](https://download.openmmlab.com/mmdetection3d/v1.0.0_models/3dssd/3dssd_4x4_kitti-3d-car/3dssd_4x4_kitti-3d-car_20210818_203828-b89c8fc4.pth) \| [log](https://download.openmmlab.com/mmdetection3d/v1.0.0_models/3dssd/3dssd_4x4_kitti-3d-car/3dssd_4x4_kitti-3d-car_20210818_203828.log.json) |
+| [PointNet2SAMSG](./3dssd_4xb4_kitti-3d-car.py) |  Car  |   72e   |   4.7    |                | 78.58(81.27)<sup>1</sup> | [model](https://download.openmmlab.com/mmdetection3d/v1.0.0_models/3dssd/3dssd_4x4_kitti-3d-car/3dssd_4x4_kitti-3d-car_20210818_203828-b89c8fc4.pth) \| [log](https://download.openmmlab.com/mmdetection3d/v1.0.0_models/3dssd/3dssd_4x4_kitti-3d-car/3dssd_4x4_kitti-3d-car_20210818_203828.log.json) |
 \[1\]: We report two different 3D object detection performance here. 78.58mAP is evaluated by our evaluation code and 81.27mAP is evaluated by the official development kit （so as that used in the paper and official code of 3DSSD ）. We found that the commonly used Python implementation of [`rotate_iou`](https://github.com/traveller59/second.pytorch/blob/e42e4a0e17262ab7d180ee96a0a36427f2c20a44/second/core/non_max_suppression/nms_gpu.py#L605) which is used in our KITTI dataset evaluation, is different from the official implementation in [KITTI benchmark](http://www.cvlibs.net/datasets/kitti/eval_object.php?obj_benchmark=3d).

--- a/configs/3dssd/metafile.yml
+++ b/configs/3dssd/metafile.yml
@@ -18,7 +18,7 @@ Collections:
 Models:
  - Name: 3dssd_4x4_kitti-3d-car
    In Collection: 3DSSD
-    Config: configs/3dssd/3dssd_4x4_kitti-3d-car.py
+    Config: configs/3dssd/3dssd_4xb4_kitti-3d-car.py
    Metadata:
      Training Memory (GB): 4.7
    Results:

--- a/configs/_base_/datasets/coco_instance.py
+++ b/configs/_base_/datasets/coco_instance.py
-dataset_type = 'CocoDataset'
-data_root = 'data/coco/'
-img_norm_cfg = dict(
-    mean=[123.675, 116.28, 103.53], std=[58.395, 57.12, 57.375], to_rgb=True)
-train_pipeline = [
-    dict(type='LoadImageFromFile'),
-    dict(type='LoadAnnotations', with_bbox=True, with_mask=True),
-    dict(type='Resize', img_scale=(1333, 800), keep_ratio=True),
-    dict(type='RandomFlip', flip_ratio=0.5),
-    dict(type='Normalize', **img_norm_cfg),
-    dict(type='Pad', size_divisor=32),
-    dict(type='DefaultFormatBundle'),
-    dict(type='Collect', keys=['img', 'gt_bboxes', 'gt_labels', 'gt_masks']),
-]
-test_pipeline = [
-    dict(type='LoadImageFromFile'),
-    dict(
-        type='MultiScaleFlipAug',
-        img_scale=(1333, 800),
-        flip=False,
-        transforms=[
-            dict(type='Resize', keep_ratio=True),
-            dict(type='RandomFlip'),
-            dict(type='Normalize', **img_norm_cfg),
-            dict(type='Pad', size_divisor=32),
-            dict(type='ImageToTensor', keys=['img']),
-            dict(type='Collect', keys=['img']),
-        ])
-]
-data = dict(
-    samples_per_gpu=2,
-    workers_per_gpu=2,
-    train=dict(
-        type=dataset_type,
-        ann_file=data_root + 'annotations/instances_train2017.json',
-        img_prefix=data_root + 'train2017/',
-        pipeline=train_pipeline),
-    val=dict(
-        type=dataset_type,
-        ann_file=data_root + 'annotations/instances_val2017.json',
-        img_prefix=data_root + 'val2017/',
-        pipeline=test_pipeline),
-    test=dict(
-        type=dataset_type,
-        ann_file=data_root + 'annotations/instances_val2017.json',
-        img_prefix=data_root + 'val2017/',
-        pipeline=test_pipeline))
-evaluation = dict(metric=['bbox', 'segm'])
--- a/configs/_base_/datasets/range100_lyft-3d.py
+++ b/configs/_base_/datasets/range100_lyft-3d.py
--- a/configs/_base_/datasets/nuim_instance.py
+++ b/configs/_base_/datasets/nuim_instance.py
--- a/configs/_base_/datasets/s3dis-3d-5class.py
+++ b/configs/_base_/datasets/s3dis-3d-5class.py
-# dataset settings
-# TODO refactor S3DISDataset
-dataset_type = 'S3DISDataset'
-data_root = './data/s3dis/'
-class_names = ('table', 'chair', 'sofa', 'bookcase', 'board')
-train_area = [1, 2, 3, 4, 6]
-test_area = 5
-file_client_args = dict(backend='disk')
-# Uncomment the following if use ceph or other file clients.
-# See https://mmcv.readthedocs.io/en/latest/api.html#mmcv.fileio.FileClient
-# for more details.
-# file_client_args = dict(
-#     backend='petrel',
-#     path_mapping=dict({
-#         './data/s3dis/':
-#         's3://s3dis/',
-#     }))
-train_pipeline = [
-    dict(
-        type='LoadPointsFromFile',
-        coord_type='DEPTH',
-        shift_height=True,
-        load_dim=6,
-        use_dim=[0, 1, 2, 3, 4, 5]),
-    dict(type='LoadAnnotations3D', with_bbox_3d=True, with_label_3d=True),
-    dict(type='PointSample', num_points=40000),
-    dict(
-        type='RandomFlip3D',
-        sync_2d=False,
-        flip_ratio_bev_horizontal=0.5,
-        flip_ratio_bev_vertical=0.5),
-    dict(
-        type='GlobalRotScaleTrans',
-        # following ScanNet dataset the rotation range is 5 degrees
-        rot_range=[-0.087266, 0.087266],
-        scale_ratio_range=[1.0, 1.0],
-        shift_height=True),
-    dict(type='DefaultFormatBundle3D', class_names=class_names),
-    dict(type='Collect3D', keys=['points', 'gt_bboxes_3d', 'gt_labels_3d'])
-]
-test_pipeline = [
-    dict(
-        type='LoadPointsFromFile',
-        coord_type='DEPTH',
-        shift_height=True,
-        load_dim=6,
-        use_dim=[0, 1, 2, 3, 4, 5]),
-    dict(
-        type='MultiScaleFlipAug3D',
-        img_scale=(1333, 800),
-        pts_scale_ratio=1,
-        flip=False,
-        transforms=[
-            dict(
-                type='GlobalRotScaleTrans',
-                rot_range=[0, 0],
-                scale_ratio_range=[1., 1.],
-                translation_std=[0, 0, 0]),
-            dict(
-                type='RandomFlip3D',
-                sync_2d=False,
-                flip_ratio_bev_horizontal=0.5,
-                flip_ratio_bev_vertical=0.5),
-            dict(type='PointSample', num_points=40000),
-            dict(
-                type='DefaultFormatBundle3D',
-                class_names=class_names,
-                with_label=False),
-            dict(type='Collect3D', keys=['points'])
-        ])
-]
-# construct a pipeline for data and gt loading in show function
-# please keep its loading function consistent with test_pipeline (e.g. client)
-eval_pipeline = [
-    dict(
-        type='LoadPointsFromFile',
-        coord_type='DEPTH',
-        shift_height=False,
-        load_dim=6,
-        use_dim=[0, 1, 2, 3, 4, 5]),
-    dict(
-        type='DefaultFormatBundle3D',
-        class_names=class_names,
-        with_label=False),
-    dict(type='Collect3D', keys=['points'])
-]
-data = dict(
-    samples_per_gpu=8,
-    workers_per_gpu=4,
-    train=dict(
-        type='RepeatDataset',
-        times=5,
-        dataset=dict(
-            type='ConcatDataset',
-            datasets=[
-                dict(
-                    type=dataset_type,
-                    data_root=data_root,
-                    ann_file=data_root + f's3dis_infos_Area_{i}.pkl',
-                    pipeline=train_pipeline,
-                    filter_empty_gt=False,
-                    classes=class_names,
-                    box_type_3d='Depth') for i in train_area
-            ],
-            separate_eval=False)),
-    val=dict(
-        type=dataset_type,
-        data_root=data_root,
-        ann_file=data_root + f's3dis_infos_Area_{test_area}.pkl',
-        pipeline=test_pipeline,
-        classes=class_names,
-        test_mode=True,
-        box_type_3d='Depth'),
-    test=dict(
-        type=dataset_type,
-        data_root=data_root,
-        ann_file=data_root + f's3dis_infos_Area_{test_area}.pkl',
-        pipeline=test_pipeline,
-        classes=class_names,
-        test_mode=True,
-        box_type_3d='Depth'))
-evaluation = dict(pipeline=eval_pipeline)
--- a/configs/_base_/datasets/s3dis_seg-3d-13class.py
+++ b/configs/_base_/datasets/s3dis_seg-3d-13class.py
--- a/configs/_base_/datasets/scannet-3d-18class.py
+++ b/configs/_base_/datasets/scannet-3d-18class.py
--- a/configs/_base_/datasets/scannet_seg-3d-20class.py
+++ b/configs/_base_/datasets/scannet_seg-3d-20class.py
--- a/configs/_base_/datasets/sunrgbd-3d-10class.py
+++ b/configs/_base_/datasets/sunrgbd-3d-10class.py
--- a/configs/_base_/models/cascade_mask_rcnn_r50_fpn.py
+++ b/configs/_base_/models/cascade_mask_rcnn_r50_fpn.py
--- a/configs/_base_/models/centerpoint_02pillar_second_secfpn_nus.py
+++ b/configs/_base_/models/centerpoint_02pillar_second_secfpn_nus.py
--- a/configs/_base_/models/centerpoint_01voxel_second_secfpn_nus.py
+++ b/configs/_base_/models/centerpoint_01voxel_second_secfpn_nus.py
--- a/configs/_base_/models/imvotenet_image.py
+++ b/configs/_base_/models/imvotenet_image.py
--- a/configs/_base_/models/mask_rcnn_r50_fpn.py
+++ b/configs/_base_/models/mask_rcnn_r50_fpn.py
--- a/configs/_base_/models/paconv_cuda_ssg.py
+++ b/configs/_base_/models/paconv_cuda_ssg.py
--- a/configs/_base_/models/hv_pointpillars_fpn_lyft.py
+++ b/configs/_base_/models/hv_pointpillars_fpn_lyft.py
-_base_ = './hv_pointpillars_fpn_nus.py'
+_base_ = './pointpillars_hv_fpn_nus.py'
 # model settings (based on nuScenes model settings)
 # Voxel size for voxel encoder