add train and test sets + take off comments

NLVR2.py

@@ -39,17 +39,15 @@ _LICENSE = "CC BY 4.0"
 
 _URL_BASE = "https://raw.githubusercontent.com/lil-lab/nlvr/master/nlvr2/data/"
 _SPLITS = {
-    # "train": "train.json",
+    "train": "train.json",
     "validation": "dev.json",
-    # "test1": "test1.json",
-    # "test2": "test2.json",
+    "test1": "test1.json",
 }
 _JZ_IMG_FOLDER_PATH = f"{os.environ['cnw_ALL_CCFRSCRATCH']}/local_datasets/nlvr2/"
 _IMG_SPLITS = {
-    # "train": "train_nlvr2.tar.gz",
+    "train": "train_nlvr2.tar.gz",
     "validation": "dev_nlvr2.tar.gz",
-    # "test1": "test1_nlvr2.tar.gz",
-    # "test2": "test2_nlvr2.tar.gz",
+    "test1": "test1_nlvr2.tar.gz",
 }
 
 
@@ -80,58 +78,52 @@ class NLVR2Dataset(datasets.GeneratorBasedBuilder):
     def _split_generators(self, dl_manager):
         urls = {
             "Default": {
-                # "train": os.path.join(_URL_BASE, _SPLITS["train"]),
+                "train": os.path.join(_URL_BASE, _SPLITS["train"]),
                 "validation": os.path.join(_URL_BASE, _SPLITS["validation"]),
-                # "test1": os.path.join(_URL_BASE, _SPLITS["test1"]),
-                # "test2": os.path.join(_URL_BASE, _SPLITS["test2"]),
+                "test1": os.path.join(_URL_BASE, _SPLITS["test1"]),
             },
         }
         files_path = dl_manager.download_and_extract(urls)
 
         images_files = {
-            # "train": os.path.join(_JZ_IMG_FOLDER_PATH, _IMG_SPLITS["train"]),
+            "train": os.path.join(_JZ_IMG_FOLDER_PATH, _IMG_SPLITS["train"]),
             "validation": os.path.join(_JZ_IMG_FOLDER_PATH, _IMG_SPLITS["validation"]),
-            # "test1": os.path.join(_JZ_IMG_FOLDER_PATH, _IMG_SPLITS["test1"]),
-            # "test2": os.path.join(_JZ_IMG_FOLDER_PATH, _IMG_SPLITS["test2"]),
+            "test1": os.path.join(_JZ_IMG_FOLDER_PATH, _IMG_SPLITS["test1"]),
         }
-        print(f"img_path:{images_files['validation']}")
-        # train_img_path = os.path.join(dl_manager.extract(images_files["train"]),  "train_nlvr2")
-        validation_img_path = os.path.join(dl_manager.download_and_extract(images_files["validation"]),  "dev_nlvr2")
-        print(f"img_path2:{validation_img_path}")
-        print(f"{os.path.exists(os.path.join(validation_img_path,'dev-946-1-img0.png'))}")
-        # test1_img_path = os.path.join(dl_manager.extract(images_files["test1"]),  "test1_nlvr2")
+        train_img_path = os.path.join(dl_manager.extract(images_files["train"]),  "train_nlvr2")
+        validation_img_path = os.path.join(dl_manager.extract(images_files["validation"]),  "dev_nlvr2")
+        test1_img_path = os.path.join(dl_manager.extract(images_files["test1"]),  "test1_nlvr2")
         return [
-            # datasets.SplitGenerator(
-            #     name=datasets.Split.TRAIN,
-            #     gen_kwargs={"files_paths": [files_path[self.config.name]["train"]], "images_path": train_img_path, "split_name": "train"},
-            # ),
+            datasets.SplitGenerator(
+                name=datasets.Split.TRAIN,
+                gen_kwargs={"files_path": files_path[self.config.name]["train"], "images_path": train_img_path, "split_name": "train"},
+            ),
             datasets.SplitGenerator(
                 name=datasets.Split.VALIDATION,
-                gen_kwargs={"files_paths": [files_path[self.config.name]["validation"]], "images_path": validation_img_path, "split_name": "dev"},
+                gen_kwargs={"files_path": files_path[self.config.name]["validation"], "images_path": validation_img_path, "split_name": "dev"},
+            ),
+            datasets.SplitGenerator(
+                name=datasets.Split.TEST,
+                gen_kwargs={"files_path": files_path[self.config.name]["test1"], "images_path": test1_img_path, "split_name": "test1"},
             ),
-            # datasets.SplitGenerator(
-            #     name=datasets.Split.TEST,
-            #     gen_kwargs={"files_paths": [files_path[self.config.name]["test1"], files_path[self.config.name]["test2"]], "images_path": test1_img_path, "split_name": "test1"},
-            # ),
         ]
 
-    def _generate_examples(self, files_paths, images_path, split_name):
+    def _generate_examples(self, files_path, images_path, split_name):
         idx = 0
-        for path in files_paths:
-            for line in open(path).readlines():
-                ex = json.loads(line)
-                common_img_identifier = ex["identifier"].split("-")
-                left_img_identifier = f"{split_name}-{common_img_identifier[1]}-{common_img_identifier[2]}-img0.png"
-                right_img_identifier = f"{split_name}-{common_img_identifier[1]}-{common_img_identifier[2]}-img1.png"
-                left_image_path = str(os.path.join(images_path, left_img_identifier))
-                right_image_path = str(os.path.join(images_path, right_img_identifier))
-                if os.path.exists(left_image_path) and os.path.exists(right_image_path):
-                    record = {
-                        "identifier": ex["identifier"],
-                        "sentence": ex["sentence"],
-                        "left_image": left_image_path,
-                        "right_image": right_image_path,
-                        "label": ex["label"],
-                    }
-                    idx += 1
-                    yield idx, record
+        for line in open(files_path).readlines():
+            ex = json.loads(line)
+            common_img_identifier = ex["identifier"].split("-")
+            left_img_identifier = f"{split_name}-{common_img_identifier[1]}-{common_img_identifier[2]}-img0.png"
+            right_img_identifier = f"{split_name}-{common_img_identifier[1]}-{common_img_identifier[2]}-img1.png"
+            left_image_path = str(os.path.join(images_path, left_img_identifier))
+            right_image_path = str(os.path.join(images_path, right_img_identifier))
+            # if os.path.exists(left_image_path) and os.path.exists(right_image_path):
+            record = {
+                "identifier": ex["identifier"],
+                "sentence": ex["sentence"],
+                "left_image": left_image_path,
+                "right_image": right_image_path,
+                "label": ex["label"],
+            }
+            idx += 1
+            yield idx, record