From 5e4d3ccc48d6473ffdf409d0e4d968f12ebeba67 Mon Sep 17 00:00:00 2001 From: shangliang Xu Date: Fri, 4 Nov 2022 15:36:43 +0800 Subject: [PATCH] [dev] fix legacy param drop_empty, test=document_fix (#7266) --- configs/datasets/coco_detection.yml | 1 + configs/deformable_detr/_base_/deformable_detr_reader.yml | 1 - configs/detr/_base_/detr_reader.yml | 1 - configs/faster_rcnn/_base_/faster_rcnn_swin_reader.yml | 1 - configs/keypoint/hrnet/dark_hrnet_w32_256x192.yml | 1 - configs/keypoint/hrnet/dark_hrnet_w32_384x288.yml | 1 - configs/keypoint/hrnet/dark_hrnet_w48_256x192.yml | 1 - configs/pphuman/dark_hrnet_w32_256x192.yml | 1 - configs/vitdet/_base_/faster_rcnn_reader.yml | 1 - docs/advanced_tutorials/READER.md | 1 - docs/advanced_tutorials/READER_en.md | 1 - .../faster_rcnn_r50_fpn_1x_coco_annotation.md | 2 -- .../faster_rcnn_r50_fpn_1x_coco_annotation_en.md | 2 -- .../config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation.md | 2 -- .../ppyolo_r50vd_dcn_1x_coco_annotation_en.md | 4 +--- 15 files changed, 2 insertions(+), 19 deletions(-) diff --git a/configs/datasets/coco_detection.yml b/configs/datasets/coco_detection.yml index 291c24874..ea0924514 100644 --- a/configs/datasets/coco_detection.yml +++ b/configs/datasets/coco_detection.yml @@ -13,6 +13,7 @@ EvalDataset: image_dir: val2017 anno_path: annotations/instances_val2017.json dataset_dir: dataset/coco + allow_empty: true TestDataset: !ImageFolder diff --git a/configs/deformable_detr/_base_/deformable_detr_reader.yml b/configs/deformable_detr/_base_/deformable_detr_reader.yml index 3822df423..c15a0f3b6 100644 --- a/configs/deformable_detr/_base_/deformable_detr_reader.yml +++ b/configs/deformable_detr/_base_/deformable_detr_reader.yml @@ -33,7 +33,6 @@ EvalReader: batch_size: 1 shuffle: false drop_last: false - drop_empty: false TestReader: diff --git a/configs/detr/_base_/detr_reader.yml b/configs/detr/_base_/detr_reader.yml index 5a7199296..997ef724a 100644 --- a/configs/detr/_base_/detr_reader.yml +++ b/configs/detr/_base_/detr_reader.yml @@ -33,7 +33,6 @@ EvalReader: batch_size: 1 shuffle: false drop_last: false - drop_empty: false TestReader: diff --git a/configs/faster_rcnn/_base_/faster_rcnn_swin_reader.yml b/configs/faster_rcnn/_base_/faster_rcnn_swin_reader.yml index ce38f0d49..e1165cd0a 100644 --- a/configs/faster_rcnn/_base_/faster_rcnn_swin_reader.yml +++ b/configs/faster_rcnn/_base_/faster_rcnn_swin_reader.yml @@ -25,7 +25,6 @@ EvalReader: batch_size: 1 shuffle: false drop_last: false - drop_empty: false TestReader: diff --git a/configs/keypoint/hrnet/dark_hrnet_w32_256x192.yml b/configs/keypoint/hrnet/dark_hrnet_w32_256x192.yml index 8418245ed..a759c121a 100644 --- a/configs/keypoint/hrnet/dark_hrnet_w32_256x192.yml +++ b/configs/keypoint/hrnet/dark_hrnet_w32_256x192.yml @@ -125,7 +125,6 @@ EvalReader: is_scale: true - Permute: {} batch_size: 16 - drop_empty: false TestReader: inputs_def: diff --git a/configs/keypoint/hrnet/dark_hrnet_w32_384x288.yml b/configs/keypoint/hrnet/dark_hrnet_w32_384x288.yml index f9ba19cf9..6eaa0ec0b 100644 --- a/configs/keypoint/hrnet/dark_hrnet_w32_384x288.yml +++ b/configs/keypoint/hrnet/dark_hrnet_w32_384x288.yml @@ -129,7 +129,6 @@ EvalReader: is_scale: true - Permute: {} batch_size: 16 - drop_empty: false TestReader: inputs_def: diff --git a/configs/keypoint/hrnet/dark_hrnet_w48_256x192.yml b/configs/keypoint/hrnet/dark_hrnet_w48_256x192.yml index d8fc6f625..1417e03d2 100644 --- a/configs/keypoint/hrnet/dark_hrnet_w48_256x192.yml +++ b/configs/keypoint/hrnet/dark_hrnet_w48_256x192.yml @@ -125,7 +125,6 @@ EvalReader: is_scale: true - Permute: {} batch_size: 16 - drop_empty: false TestReader: inputs_def: diff --git a/configs/pphuman/dark_hrnet_w32_256x192.yml b/configs/pphuman/dark_hrnet_w32_256x192.yml index 8418245ed..a759c121a 100644 --- a/configs/pphuman/dark_hrnet_w32_256x192.yml +++ b/configs/pphuman/dark_hrnet_w32_256x192.yml @@ -125,7 +125,6 @@ EvalReader: is_scale: true - Permute: {} batch_size: 16 - drop_empty: false TestReader: inputs_def: diff --git a/configs/vitdet/_base_/faster_rcnn_reader.yml b/configs/vitdet/_base_/faster_rcnn_reader.yml index ce38f0d49..e1165cd0a 100644 --- a/configs/vitdet/_base_/faster_rcnn_reader.yml +++ b/configs/vitdet/_base_/faster_rcnn_reader.yml @@ -25,7 +25,6 @@ EvalReader: batch_size: 1 shuffle: false drop_last: false - drop_empty: false TestReader: diff --git a/docs/advanced_tutorials/READER.md b/docs/advanced_tutorials/READER.md index 60c9fee67..21b7865df 100644 --- a/docs/advanced_tutorials/READER.md +++ b/docs/advanced_tutorials/READER.md @@ -312,7 +312,6 @@ EvalReader: - Decode: {} ... batch_size: 1 - drop_empty: false TestReader: inputs_def: diff --git a/docs/advanced_tutorials/READER_en.md b/docs/advanced_tutorials/READER_en.md index 07940a965..449c468d8 100644 --- a/docs/advanced_tutorials/READER_en.md +++ b/docs/advanced_tutorials/READER_en.md @@ -312,7 +312,6 @@ EvalReader: - Decode: {} ... batch_size: 1 - drop_empty: false TestReader: inputs_def: diff --git a/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation.md b/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation.md index 32b9024bf..becfaa586 100644 --- a/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation.md +++ b/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation.md @@ -114,8 +114,6 @@ EvalReader: shuffle: false # 是否丢弃最后不能完整组成batch的数据 drop_last: false - # 是否丢弃没有标注的数据 - drop_empty: false # 测试数据 TestReader: diff --git a/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation_en.md b/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation_en.md index 4c8c92599..15090f842 100644 --- a/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation_en.md +++ b/docs/tutorials/config_annotation/faster_rcnn_r50_fpn_1x_coco_annotation_en.md @@ -114,8 +114,6 @@ EvalReader: shuffle: false # Whether to discard data that does not complete the batch drop_last: false - # Whether to discard unlabeled data - drop_empty: false # test data TestReader: diff --git a/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation.md b/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation.md index 2cbc188dc..936905322 100644 --- a/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation.md +++ b/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation.md @@ -121,8 +121,6 @@ EvalReader: - Permute: {} # 评估时batch_size batch_size: 8 - # 是否丢弃没有标注的数据 - drop_empty: false # 测试数据 TestReader: diff --git a/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation_en.md b/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation_en.md index dfcdd45fd..f6f3452e9 100644 --- a/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation_en.md +++ b/docs/tutorials/config_annotation/ppyolo_r50vd_dcn_1x_coco_annotation_en.md @@ -121,8 +121,6 @@ EvalReader: - Permute: {} # Batch_size during evaluation batch_size: 8 - # Whether to discard unlabeled data - drop_empty: false # test data TestReader: @@ -215,7 +213,7 @@ YOLOv3Loss: ignore_thresh: 0.7 # downsample downsample: [32, 16, 8] - # whether label_smooth or not + # whether label_smooth or not label_smooth: false # scale_x_y scale_x_y: 1.05 -- GitLab