Update testdata.py

testdata.py

@@ -22,7 +22,10 @@ from typing import List
 import re
 from collections import defaultdict
 import datasets
-from PIL import Image
+
+datasets.logging.set_verbosity_info()
+
+
 
 
 _HOMEPAGE = "http://shuoyang1213.me/WIDERFACE/"
@@ -57,29 +60,11 @@ _URLS = {
 }
 
 IMG_EXT = ['png', 'jpeg', 'jpg']
-_SUBREDDITS = ["zurich"]
-
-class TestDataConfig(datasets.BuilderConfig):
-    """BuilderConfig for TestData."""
 
-    def __init__(self, name, **kwargs):
-        """BuilderConfig for TestData.
-        Args:
-          **kwargs: keyword arguments forwarded to super.
-        """
-        super(TestDataConfig, self).__init__(version=datasets.Version("1.0.0", ""), name=name, **kwargs)
 
 class TestData(datasets.GeneratorBasedBuilder):
     """WIDER FACE dataset."""
-    
-    BUILDER_CONFIGS = [
-        TestDataConfig("fisheye"),
-    ]
-    
-    BUILDER_CONFIGS += [TestDataConfig(subreddit) for subreddit in _SUBREDDITS]
-    
-    DEFAULT_CONFIG_NAME = "fisheye"
-    
+
     VERSION = datasets.Version("1.0.0")
 
     def _info(self):
@@ -88,15 +73,8 @@ class TestData(datasets.GeneratorBasedBuilder):
             features=datasets.Features(
                 {
                     "image": datasets.Image(),
-                    "objects": datasets.Sequence(
-                        {
-                            "faces": datasets.Sequence(datasets.Sequence(datasets.Value("float32"), length=4)),
-                            "plates": datasets.Sequence(datasets.Sequence(datasets.Value("float32"), length=4)),
-                        }
-                    ),
-                    #"faces": datasets.Sequence(datasets.Sequence(datasets.Value("float32"), length=4)),
-                    # "plates": datasets.Sequence(datasets.Sequence(datasets.Value("float32"), length=4)), 
-                    # "size": datasets.Sequence(datasets.Sequence(datasets.Value("float32"), length=2)), 
+                    "faces": datasets.Sequence(datasets.Sequence(datasets.Value("float32"), length=4)),
+                    "plates": datasets.Sequence(datasets.Sequence(datasets.Value("float32"), length=4)), 
                     
                 }
             ),
@@ -112,32 +90,35 @@ class TestData(datasets.GeneratorBasedBuilder):
             datasets.SplitGenerator(
                 name=datasets.Split.TEST,
                 gen_kwargs={
-                    "name": self.config.name,
+                    "split": "fisheye",
+                    "data_dir": data_dir["test"],
+                    "annot_dir": data_dir["annot"],
+                },
+            ),
+            datasets.SplitGenerator(
+                name=datasets.Split.TRAIN,
+                gen_kwargs={
+                    "split": "normal",
                     "data_dir": data_dir["test"],
                     "annot_dir": data_dir["annot"],
                 },
             ),
         ]
 
-    def _generate_examples(self, name, data_dir, annot_dir):
-        
-        image_dir = os.path.join(data_dir, name)
-        annotation_dir = os.path.join(annot_dir, name)
+    def _generate_examples(self, split, data_dir, annot_dir):
+        image_dir = os.path.join(data_dir, "fisheye")
+        annotation_dir = os.path.join(annot_dir, "fisheye")
         files = []
         
         idx = 0
         for i_file in glob(os.path.join(image_dir, "*.png")):
             plates = []
             faces = []
-            objects = []
             
             img_relative_file = os.path.relpath(i_file, image_dir)
             gt_relative_path = img_relative_file.replace(".png", ".txt")
             
             gt_path = os.path.join(annotation_dir, gt_relative_path)
-            # img = Image.open( i_file )
-            # img_h, img_w = img.size
-            # sizes.append([img_h, img_w])
             
             annotation = defaultdict(list)
             with open(gt_path, "r", encoding="utf-8") as f:
@@ -147,7 +128,6 @@ class TestData(datasets.GeneratorBasedBuilder):
                     cls, cx, cy, w, h = line.split()[:5]
                     cls, cx, cy, w, h = int(cls), float(cx), float(cy), float(w), float(h)
                     x1, y1, x2, y2 = cx - w / 2, cy - h / 2, cx + w / 2, cy + h / 2
-                    # x1, y1, x2, y2 = round(x1 * img_w), round(y1 * img_h), round(x2 * img_w), round(y2 * img_h)
                     annotation[cls].append([x1, y1, x2, y2])
                     line = f.readline().strip()
 
@@ -157,13 +137,8 @@ class TestData(datasets.GeneratorBasedBuilder):
                         faces.append([x1, y1, x2, y2])
                     else:
                         plates.append([x1, y1, x2, y2])
-            objects.append(
-                {
-                    "faces": faces,
-                    "plates": plates
-                }
-            )
-            yield idx, {"image": i_file, "objects": objects}
+            
+            yield idx, {"image": i_file, "faces": faces, "plates": plates}
             
             idx += 1