aggregate

prepare_for_release.py

@@ -12,7 +12,7 @@ from multiprocessing import Manager, Pool, cpu_count, set_start_method
 from queue import Queue
 from threading import Thread
 from time import sleep
-from typing import Optional, Tuple
+from typing import List, Optional, Tuple
 
 from smashed.utils import (
     MultiPath,
@@ -26,35 +26,40 @@ from tqdm import tqdm
 
 
 def process_single(
-    io_paths: Tuple[MultiPath, MultiPath],
+    io_paths: Tuple[List[MultiPath], MultiPath],
     version: str,
     pbar_queue: Optional[Queue] = None,
 ):
-    src, dst = io_paths
+    all_src, dst = io_paths
     docs_cnt = 0
 
-    with ExitStack() as stack:
-        in_file = stack.enter_context(stream_file_for_read(src, "rb"))
-        in_stream = stack.enter_context(decompress_stream(in_file, "rt"))
-        out_file = stack.enter_context(open_file_for_write(dst, "wb"))
-        out_stream = stack.enter_context(compress_stream(out_file, "wt"))
+    with ExitStack() as in_stack, ExitStack() as out_stack:
+        out_file = out_stack.enter_context(open_file_for_write(dst, "wb"))
+        out_stream = out_stack.enter_context(compress_stream(out_file, "wt"))
+        for src in all_src:
+            in_file = in_stack.enter_context(stream_file_for_read(src, "rb"))
+            in_stream = in_stack.enter_context(decompress_stream(in_file, "rt"))
+
+            for line in in_stream:
+                data = json.loads(line)
+                data.pop("metadata", None)
+                data["source"] = "s2ag" if "dataset=s2ag" in src.as_str else "s2orc"
+                data["split"] = "train" if "split=train" in src.as_str else "valid"
+                data["version"] = version
 
-        for line in in_stream:
-            data = json.loads(line)
-            data.pop("metadata", None)
-            data["source"] = "s2ag" if "dataset=s2ag" in src.as_str else "s2orc"
-            data["split"] = "train" if "split=train" in src.as_str else "valid"
-            data["version"] = version
+                out_stream.write(json.dumps(data) + "\n")
+                docs_cnt += 1
 
-            out_stream.write(json.dumps(data) + "\n")
-            docs_cnt += 1
+                if pbar_queue is not None and docs_cnt % 1000 == 0:
+                    pbar_queue.put((0, docs_cnt))
+                    docs_cnt = 0
 
-            if pbar_queue is not None and docs_cnt % 1000 == 0:
-                pbar_queue.put((0, docs_cnt))
-                docs_cnt = 0
+            in_stack.pop_all().close()
+            if pbar_queue is not None:
+                pbar_queue.put((1, 0))
 
     if pbar_queue is not None:
-        pbar_queue.put((1, docs_cnt))
+        pbar_queue.put((0, docs_cnt))
 
 
 def threaded_progressbar(q: Queue, timeout: float, total_files: Optional[int] = None):
@@ -81,9 +86,7 @@ def main():
     ap = argparse.ArgumentParser()
     ap.add_argument("src", type=str, help="Source path")
     ap.add_argument("dst", type=str, help="Destination path")
-    ap.add_argument(
-        "--debug", default=False, help="Debug mode", action="store_true"
-    )
+    ap.add_argument("--debug", default=False, help="Debug mode", action="store_true")
     ap.add_argument(
         "--parallel", type=int, default=cpu_count(), help="Number of parallel processes"
     )
@@ -95,11 +98,20 @@ def main():
     src = MultiPath.parse(opts.src)
     dst = MultiPath.parse(opts.dst)
 
-    src_paths = [MultiPath.parse(p) for p in recursively_list_files(src)]
-    dst_paths = [
-        dst / (diff) if len(diff := (single_src - src)) > 0 else dst
-        for single_src in src_paths
-    ]
+    # catch all in top level directory
+    grouped_src_paths = {}
+    for single_src in recursively_list_files(src):
+        single_src_dir, _ = single_src.rsplit("/", 1)
+        grouped_src_paths.setdefault(single_src_dir, []).append(single_src)
+
+    src_paths: List[List[MultiPath]] = []
+    dst_paths: List[MultiPath] = []
+    for dir_name, dir_values in grouped_src_paths.items():
+        src_paths.append([MultiPath.parse(p) for p in dir_values])
+        dir_path = MultiPath.parse(dir_name.replace("part_id=", "") + ".gz")
+        dst_path = dst / (diff) if len(diff := (dir_path - src)) > 0 else dst
+        dst_path.path = dst_path.path.replace("split=", "").replace("dataset=", "")
+        dst_paths.append(dst_path)
 
     if opts.debug:
         with tqdm(total=len(src_paths)) as pbar:
@@ -114,7 +126,7 @@ def main():
             pbar_queue: Queue = (manager := Manager()).Queue()
             pbar_thread = Thread(
                 target=threaded_progressbar,
-                args=(pbar_queue, 0.1, len(src_paths)),
+                args=(pbar_queue, 0.1, sum(len(p) for p in src_paths)),
                 daemon=True,
             )
             pbar_thread.start()