🔀 Merge pull request #35 from boostcampaitech4lv23cv3/classwise

✨ Update WandB logging strategy
boostcampaitech4lv23cv3 · Feb 1, 2023 · 7f0e621 · 7f0e621
2 parents b11e970 + 2d9d989
commit 7f0e621
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/mmyolo/configs/_emergency_/_base_/default_runtime.py b/mmyolo/configs/_emergency_/_base_/default_runtime.py
@@ -1,21 +1,25 @@
 default_scope = "mmyolo"
 
-# dataset version 3
-# num_classes = 4
-# metainfo = dict(
-#     classes=("ambulance", "fire truck", "ladder truck", "police car")
-# )
-
-# dataset version 4
-# num_classes = 3
-# metainfo = dict(
-#     classes=("ambulance", "fire truck", "police car")
-# )
-
-# data directory and annotation file paths
+# choose dataset version
+# dataset_version = "ver3"
+dataset_version = "ver4"
+
+if dataset_version == "ver3":
+    num_classes = 4
+    classes=("ambulance", "fire truck", "ladder truck", "police car")
+    train_ann_file = "labels/*.json"
+    val_ann_file = "labels/*.json"
+elif dataset_version == "ver4":
+    num_classes = 3
+    classes=("ambulance", "fire truck", "police car")
+    train_ann_file = "labels/*.json"
+    val_ann_file = "labels/*.json"
+
+metainfo = dict(classes=classes)
+dataset_prefix = dataset_version
+
+# dataset directory
 data_root = "/opt/ml/input/"
-train_ann_file = "labels/*.json"
-val_ann_file = "labels/*.json"
 
 default_hooks = dict(
     timer=dict(type="IterTimerHook"),
@@ -40,6 +44,7 @@
             "entity": "boostcamp-ai-tech-4-cv-17",
             "project": "Final Project",
             "name": "model_name",
+            "group": dataset_version,
         },
     ),
 ]

diff --git a/mmyolo/configs/_emergency_/ppyoloe/ppyoloe_plus_s_fast_8xb8-80e_coco.py b/mmyolo/configs/_emergency_/ppyoloe/ppyoloe_plus_s_fast_8xb8-80e_coco.py
@@ -257,6 +257,8 @@
     proposal_nums=(100, 1, 10),
     ann_file=data_root + _base_.val_ann_file,
     metric="bbox",
+    classwise=True,
+    prefix=_base_.dataset_prefix
 )
 test_evaluator = val_evaluator
 

diff --git a/mmyolo/configs/_emergency_/yolov5/yolov5_s-v61_syncbn_8xb16-300e_coco.py b/mmyolo/configs/_emergency_/yolov5/yolov5_s-v61_syncbn_8xb16-300e_coco.py
@@ -274,6 +274,8 @@
     proposal_nums=(100, 1, 10),
     ann_file=data_root + _base_.val_ann_file,
     metric="bbox",
+    classwise=True,
+    prefix=_base_.dataset_prefix
 )
 test_evaluator = val_evaluator
 

diff --git a/mmyolo/configs/_emergency_/yolov6/yolov6_s_syncbn_fast_8xb32-400e_coco.py b/mmyolo/configs/_emergency_/yolov6/yolov6_s_syncbn_fast_8xb32-400e_coco.py
@@ -288,6 +288,8 @@
     proposal_nums=(100, 1, 10),
     ann_file=data_root + _base_.val_ann_file,
     metric="bbox",
+    classwise=True,
+    prefix=_base_.dataset_prefix
 )
 test_evaluator = val_evaluator
 

diff --git a/mmyolo/configs/_emergency_/yolov7/yolov7_l_syncbn_fast_8x16b-300e_coco.py b/mmyolo/configs/_emergency_/yolov7/yolov7_l_syncbn_fast_8x16b-300e_coco.py
@@ -284,6 +284,8 @@
     proposal_nums=(100, 1, 10),  # Can be accelerated
     ann_file=data_root + _base_.val_ann_file,
     metric="bbox",
+    classwise=True,
+    prefix=_base_.dataset_prefix
 )
 test_evaluator = val_evaluator
 

diff --git a/mmyolo/configs/_emergency_/yolov8/yolov8_s_syncbn_fast_8xb16-500e_coco.py b/mmyolo/configs/_emergency_/yolov8/yolov8_s_syncbn_fast_8xb16-500e_coco.py
@@ -316,6 +316,8 @@
     proposal_nums=(100, 1, 10),
     ann_file=data_root + _base_.val_ann_file,
     metric="bbox",
+    classwise=True,
+    prefix=_base_.dataset_prefix
 )
 test_evaluator = val_evaluator