Fixed conflicts

RapidAI · Mar 28, 2024 · 887d707 · 887d707
2 parents b4210ea + bc0338e
commit 887d707
Show file tree

Hide file tree

Showing 111 changed files with 601 additions and 712 deletions.
diff --git a/dataset/YOLOV5/train.txt b/dataset/YOLOV5/train.txt
diff --git a/dataset/YOLOV5/val.txt b/dataset/YOLOV5/val.txt
diff --git a/dataset/YOLOV5_yaml/sample.yaml b/dataset/YOLOV5_yaml/sample.yaml
diff --git a/dataset/darknet/coco_dataset/annotations/instances_train2017.json b/dataset/darknet/coco_dataset/annotations/instances_train2017.json
diff --git a/dataset/darknet/coco_dataset/annotations/instances_val2017.json b/dataset/darknet/coco_dataset/annotations/instances_val2017.json
diff --git a/dataset/darknet/coco_dataset/images/train2017/000000000001.jpg b/dataset/darknet/coco_dataset/images/train2017/000000000001.jpg
diff --git a/dataset/darknet/coco_dataset/images/val2017/000000000001.jpg b/dataset/darknet/coco_dataset/images/val2017/000000000001.jpg
diff --git a/dataset/darknet/gen_config.data b/dataset/darknet/gen_config.data
diff --git a/dataset/labelImg_dataset/classes.txt b/dataset/labelImg_dataset/classes.txt
diff --git a/dataset/labelImg_dataset/images(3).jpg b/dataset/labelImg_dataset/images(3).jpg
diff --git a/dataset/labelImg_dataset/images(3).txt b/dataset/labelImg_dataset/images(3).txt
diff --git a/dataset/labelImg_dataset/images6.jpg b/dataset/labelImg_dataset/images6.jpg
diff --git a/dataset/labelImg_dataset_output/classes.txt b/dataset/labelImg_dataset_output/classes.txt
diff --git a/dataset/labelImg_dataset_output/images/images(13).jpg b/dataset/labelImg_dataset_output/images/images(13).jpg
diff --git a/dataset/labelImg_dataset_output/images/images(3).jpg b/dataset/labelImg_dataset_output/images/images(3).jpg
diff --git a/dataset/labelImg_dataset_output/images/images4.jpg b/dataset/labelImg_dataset_output/images/images4.jpg
diff --git a/dataset/labelImg_dataset_output/labels/images(13).txt b/dataset/labelImg_dataset_output/labels/images(13).txt
diff --git a/dataset/labelImg_dataset_output/labels/images(3).txt b/dataset/labelImg_dataset_output/labels/images(3).txt
diff --git a/dataset/labelImg_dataset_output/labels/images4.txt b/dataset/labelImg_dataset_output/labels/images4.txt
diff --git a/dataset/labelImg_dataset_output/non_labels/images6.jpg b/dataset/labelImg_dataset_output/non_labels/images6.jpg
diff --git a/dataset/labelImg_dataset_output/test.txt b/dataset/labelImg_dataset_output/test.txt
diff --git a/dataset/labelImg_dataset_output/train.txt b/dataset/labelImg_dataset_output/train.txt
diff --git a/dataset/labelImg_dataset_output/val.txt b/dataset/labelImg_dataset_output/val.txt
diff --git a/dataset/labelImg_format/train/000000000001.jpg b/dataset/labelImg_format/train/000000000001.jpg
diff --git a/dataset/labelImg_format/train/000000000001.txt b/dataset/labelImg_format/train/000000000001.txt
diff --git a/dataset/labelImg_format/train/000000000002.jpg b/dataset/labelImg_format/train/000000000002.jpg
diff --git a/dataset/labelImg_format/train/classes.txt b/dataset/labelImg_format/train/classes.txt
diff --git a/dataset/labelImg_format/val/000000000001.jpg b/dataset/labelImg_format/val/000000000001.jpg
diff --git a/dataset/labelImg_format/val/000000000001.txt b/dataset/labelImg_format/val/000000000001.txt
diff --git a/dataset/labelImg_format/val/classes.txt b/dataset/labelImg_format/val/classes.txt
diff --git a/dataset/publaynet_format/train/images(13).jpg b/dataset/publaynet_format/train/images(13).jpg
diff --git a/dataset/publaynet_format/train/images(13).txt b/dataset/publaynet_format/train/images(13).txt
diff --git a/dataset/publaynet_format/train/images(3).jpg b/dataset/publaynet_format/train/images(3).jpg
diff --git a/dataset/publaynet_format/train/images(3).txt b/dataset/publaynet_format/train/images(3).txt
diff --git a/dataset/publaynet_format/train/images4.jpg b/dataset/publaynet_format/train/images4.jpg
diff --git a/dataset/publaynet_format/train/images4.txt b/dataset/publaynet_format/train/images4.txt
diff --git a/dataset/publaynet_format/train/images5.jpg b/dataset/publaynet_format/train/images5.jpg
diff --git a/dataset/publaynet_format/train/images5.txt b/dataset/publaynet_format/train/images5.txt
diff --git a/dataset/publaynet_format/train/images7.jpg b/dataset/publaynet_format/train/images7.jpg
diff --git a/dataset/publaynet_format/train/images7.txt b/dataset/publaynet_format/train/images7.txt
diff --git a/dataset/publaynet_format/val/images(13).jpg b/dataset/publaynet_format/val/images(13).jpg
diff --git a/dataset/publaynet_format/val/images(13).txt b/dataset/publaynet_format/val/images(13).txt
diff --git a/dataset/publaynet_format/val/images5.jpg b/dataset/publaynet_format/val/images5.jpg
diff --git a/dataset/publaynet_format/val/images5.txt b/dataset/publaynet_format/val/images5.txt
diff --git a/dataset/publaynet_format/val/images7.jpg b/dataset/publaynet_format/val/images7.jpg
diff --git a/dataset/publaynet_format/val/images7.txt b/dataset/publaynet_format/val/images7.txt
diff --git a/label_convert/coco_to_labelImg.py b/label_convert/coco_to_labelImg.py
@@ -5,14 +5,16 @@
 import json
 import shutil
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Tuple, Union
 
 import numpy as np
 from tqdm import tqdm
 
+ValueType = Union[str, Path, None]
 
-class COCO2labelImg:
-    def __init__(self, data_dir: Optional[str] = None, save_dir: Optional[str] = None):
+
+class COCOTolabelImg:
+    def __init__(self, data_dir: ValueType = None, save_dir: ValueType = None):
         self.data_dir = Path(data_dir)
         self.verify_exists(self.data_dir)
 
@@ -29,12 +31,9 @@ def __init__(self, data_dir: Optional[str] = None, save_dir: Optional[str] = Non
         self.verify_exists(self.train2017_dir)
         self.verify_exists(self.val2017_dir)
 
-        self.save_dir = Path(save_dir)
         if save_dir is None:
-            self.save_dir = (
-                self.data_dir.parent / f"{self.data_dir.name}_labelImg_format"
-            )
-
+            save_dir = self.data_dir.parent / f"{self.data_dir.name}_labelImg"
+        self.save_dir = Path(save_dir)
         self.mkdir(self.save_dir)
 
         self.save_train_dir = self.save_dir / "train"
@@ -145,15 +144,15 @@ def main():
     parser.add_argument(
         "--data_dir",
         type=str,
-        default="dataset/YOLOV5_COCO_format",
+        default=None,
         help="Dataset root path",
     )
     parser.add_argument(
         "--save_dir", type=str, default=None, help="Path to save the converted dataset."
     )
     args = parser.parse_args()
 
-    converter = COCO2labelImg(args.data_dir, args.save_dir)
+    converter = COCOTolabelImg(args.data_dir, args.save_dir)
     converter()