replace dataset name in cfg

BonesCat · Jul 4, 2021 · 73ef835 · 73ef835
1 parent 739f844
commit 73ef835
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 25 deletions.
diff --git a/config/EfficientNet-Lite/nanodet-EfficientNet-Lite0_320.yml b/config/EfficientNet-Lite/nanodet-EfficientNet-Lite0_320.yml
@@ -48,7 +48,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: /coco/train2017
     ann_path: /coco/annotations/instances_train2017.json
     input_size: [320,320] #[w,h]
@@ -66,7 +66,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[127.0, 127.0, 127.0], [128.0, 128.0, 128.0]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: /coco/val2017
     ann_path: /coco/annotations/instances_val2017.json
     input_size: [320,320] #[w,h]

diff --git a/config/EfficientNet-Lite/nanodet-EfficientNet-Lite1_416.yml b/config/EfficientNet-Lite/nanodet-EfficientNet-Lite1_416.yml
@@ -49,7 +49,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: /coco/train2017
     ann_path: /coco/annotations/instances_train2017.json
     input_size: [416,416] #[w,h]
@@ -67,7 +67,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[127.0, 127.0, 127.0], [128.0, 128.0, 128.0]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: /coco/val2017
     ann_path: /coco/annotations/instances_val2017.json
     input_size: [416,416] #[w,h]

diff --git a/config/EfficientNet-Lite/nanodet-EfficientNet-Lite2_512.yml b/config/EfficientNet-Lite/nanodet-EfficientNet-Lite2_512.yml
@@ -49,7 +49,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: /coco/train2017
     ann_path: /coco/annotations/instances_train2017.json
     input_size: [512,512] #[w,h]
@@ -67,7 +67,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[127.0, 127.0, 127.0], [128.0, 128.0, 128.0]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: /coco/val2017
     ann_path: /coco/annotations/instances_val2017.json
     input_size: [512,512] #[w,h]

diff --git a/config/RepVGG/nanodet-RepVGG-A0_416.yml b/config/RepVGG/nanodet-RepVGG-A0_416.yml
@@ -45,7 +45,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: /coco/train2017
     ann_path: /coco/annotations/instances_train2017.json
     input_size: [416,416] #[w,h]
@@ -63,7 +63,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: /coco/val2017
     ann_path: /coco/annotations/instances_val2017.json
     input_size: [416,416] #[w,h]

diff --git a/config/Transformer/nanodet-t.yml b/config/Transformer/nanodet-t.yml
@@ -52,7 +52,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: coco/train2017
     ann_path: coco/annotations/instances_train2017.json
     input_size: [320,320] #[w,h]
@@ -70,7 +70,7 @@ data:
       saturation: [0.8, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: coco/val2017
     ann_path: coco/annotations/instances_val2017.json
     input_size: [320,320] #[w,h]

diff --git a/config/nanodet-g.yml b/config/nanodet-g.yml
@@ -52,7 +52,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: coco/train2017
     ann_path: coco/annotations/instances_train2017.json
     input_size: [416,416] #[w,h]
@@ -70,7 +70,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: coco/val2017
     ann_path: coco/annotations/instances_val2017.json
     input_size: [416,416] #[w,h]

diff --git a/config/nanodet-m-0.5x.yml b/config/nanodet-m-0.5x.yml
@@ -47,7 +47,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: coco/train2017
     ann_path: coco/annotations/instances_train2017.json
     input_size: [320,320] #[w,h]
@@ -65,7 +65,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: coco/val2017
     ann_path: coco/annotations/instances_val2017.json
     input_size: [320,320] #[w,h]

diff --git a/config/nanodet-m-1.5x-416.yml b/config/nanodet-m-1.5x-416.yml
@@ -47,7 +47,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: coco/train2017
     ann_path: coco/annotations/instances_train2017.json
     input_size: [416,416] #[w,h]
@@ -65,7 +65,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: coco/val2017
     ann_path: coco/annotations/instances_val2017.json
     input_size: [416,416] #[w,h]

diff --git a/config/nanodet-m-1.5x.yml b/config/nanodet-m-1.5x.yml
@@ -47,7 +47,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: coco/train2017
     ann_path: coco/annotations/instances_train2017.json
     input_size: [320,320] #[w,h]
@@ -65,7 +65,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: coco/val2017
     ann_path: coco/annotations/instances_val2017.json
     input_size: [320,320] #[w,h]

diff --git a/config/nanodet-m-416.yml b/config/nanodet-m-416.yml
@@ -47,7 +47,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: coco/train2017
     ann_path: coco/annotations/instances_train2017.json
     input_size: [416,416] #[w,h]
@@ -65,7 +65,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: coco/val2017
     ann_path: coco/annotations/instances_val2017.json
     input_size: [416,416] #[w,h]

diff --git a/config/nanodet-m.yml b/config/nanodet-m.yml
@@ -41,7 +41,7 @@ model:
           loss_weight: 2.0
 data:
   train:
-    name: coco
+    name: CocoDataset
     img_path: coco/train2017
     ann_path: coco/annotations/instances_train2017.json
     input_size: [320,320] #[w,h]
@@ -59,7 +59,7 @@ data:
       saturation: [0.5, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: coco
+    name: CocoDataset
     img_path: coco/val2017
     ann_path: coco/annotations/instances_val2017.json
     input_size: [320,320] #[w,h]

diff --git a/config/nanodet_custom_xml_dataset.yml b/config/nanodet_custom_xml_dataset.yml
@@ -43,7 +43,7 @@ model:
 class_names: &class_names ['NAME1', 'NAME2', 'NAME3', 'NAME4', '...']  #Please fill in the category names (not include background category)
 data:
   train:
-    name: xml_dataset
+    name: XMLDataset
     class_names: *class_names
     img_path: TRAIN_IMAGE_FOLDER  #Please fill in train image path
     ann_path: TRAIN_XML_FOLDER  #Please fill in train xml path
@@ -62,7 +62,7 @@ data:
       saturation: [0.8, 1.2]
       normalize: [[103.53, 116.28, 123.675], [57.375, 57.12, 58.395]]
   val:
-    name: xml_dataset
+    name: XMLDataset
     class_names: *class_names
     img_path: VAL_IMAGE_FOLDER #Please fill in val image path
     ann_path: VAL_XML_FOLDER #Please fill in val xml path

diff --git a/nanodet/data/dataset/__init__.py b/nanodet/data/dataset/__init__.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import copy
+import warnings
 
 from .coco import CocoDataset
 from .xml_dataset import XMLDataset
@@ -22,8 +23,19 @@ def build_dataset(cfg, mode):
     dataset_cfg = copy.deepcopy(cfg)
     name = dataset_cfg.pop("name")
     if name == "coco":
+        warnings.warn(
+            "Dataset name coco has been deprecated. Please use CocoDataset instead."
+        )
         return CocoDataset(mode=mode, **dataset_cfg)
-    if name == "xml_dataset":
+    elif name == "xml_dataset":
+        warnings.warn(
+            "Dataset name xml_dataset has been deprecated. "
+            "Please use XMLDataset instead."
+        )
+        return XMLDataset(mode=mode, **dataset_cfg)
+    elif name == "CocoDataset":
+        return CocoDataset(mode=mode, **dataset_cfg)
+    elif name == "XMLDataset":
         return XMLDataset(mode=mode, **dataset_cfg)
     else:
         raise NotImplementedError("Unknown dataset type!")