changes to symlinks to account for hf stuff

.gitattributes

@@ -1,2 +1,6 @@
 *.jpg filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+data/ filter=lfs diff=lfs merge=lfs -text
+

dronescapes_reader/multitask_dataset.py

@@ -128,13 +128,19 @@ class MultiTaskDataset(Dataset):
         all_repr_dirs: list[str] = [x.name for x in self.path.iterdir() if x.is_dir()]
         for repr_dir_name in all_repr_dirs:
             dir_name = self.path / repr_dir_name
-            items = natsorted(dir_name.glob(f"*.{self.suffix}"), key=lambda x: x.name) # important: use natsorted() here
-            in_files[repr_dir_name] = items
+            if all(f.is_dir() for f in dir_name.iterdir()): # dataset is stored as repr/part_x/0.npz, ..., part_k/n.npz
+                all_files = []
+                for part in dir_name.iterdir():
+                    all_files.extend(part.glob(f"*.{self.suffix}"))
+            else: # dataset is stored as repr/0.npz, ..., repr/n.npz
+                all_files = dir_name.glob(f"*.{self.suffix}")
+            in_files[repr_dir_name] = natsorted(all_files, key=lambda x: x.name) # important: use natsorted() here
         assert not any(len(x) == 0 for x in in_files.values()), f"{ [k for k, v in in_files.items() if len(v) == 0] }"
         return in_files
 
     def _build_dataset_drop(self) -> BuildDatasetTuple:
         in_files = self._get_all_npz_files()
+        name_to_node_path = {k: {_v.name: _v for _v in v} for k, v in in_files.items()} # {node: {name: path}}
         common = set(x.name for x in next(iter(in_files.values())))
         nodes = in_files.keys()
         for node in nodes:
@@ -142,11 +148,13 @@ class MultiTaskDataset(Dataset):
             assert len(common) > 0, f"Node '{node}' made the intersection null"
         common = natsorted(list(common))
         logger.info(f"Found {len(common)} data points for each node ({len(nodes)} nodes).")
-        files_per_repr = {node: [self.path / node / x for x in common] for node in nodes}
+        files_per_repr = {node: [name_to_node_path[node][x] for x in common] for node in nodes}
+        assert len(files_per_repr) > 0
         return files_per_repr, common
 
     def _build_dataset_fill_none(self) -> BuildDatasetTuple:
         in_files = self._get_all_npz_files()
+        name_to_node_path = {k: {_v.name: _v for _v in v} for k, v in in_files.items()}
         all_files = set(x.name for x in next(iter(in_files.values())))
         nodes = in_files.keys()
         for node in nodes:
@@ -158,8 +166,9 @@ class MultiTaskDataset(Dataset):
         in_file_names = {node: [f.name for f in in_files[node]] for node in nodes}
         for node in nodes:
             for file_name in all_files:
-                file_path = self.path / node / file_name if file_name in in_file_names[node] else None
+                file_path = name_to_node_path[node].get(file_name, None)
                 files_per_repr[node].append(file_path)
+        assert len(files_per_repr) > 0
         return files_per_repr, all_files
 
     def _build_dataset(self) -> BuildDatasetTuple:

symlinks_from_txt_list.py

@@ -48,6 +48,30 @@ def check_and_gather_all_files(dataset_dir: Path, txt_data: list[tuple[str, str]
     logger.info(f"Gathered {len(symlinks_to_do)} symlinks to create")
     return symlinks_to_do
 
+def make_partitions_if_needed(symlinks_to_do: dict[str, str], partition_max_size: int) -> dict[str, str]:
+    """updated from out_dir/repr/0.npz to out_dir/repr/part_0/0.npz if needed"""
+    symlinks_by_repr = {} # gather as {repr: {in_file: out_file}}
+    for k, v in symlinks_to_do.items():
+        _repr = v.parent.name
+        if _repr not in symlinks_by_repr:
+            symlinks_by_repr[_repr] = {}
+        symlinks_by_repr[_repr][k] = v
+
+    new_symlinks_to_do = {}
+    for _repr, repr_files in symlinks_by_repr.items():
+        if (count := len(repr_files)) <= partition_max_size:
+            new_symlinks_to_do = {**new_symlinks_to_do, **repr_files}
+        else:
+            logger.info(f"Representation {_repr} has {count} items which > than {partition_max_size}. Partitioning.")
+            n_parts = (count // partition_max_size) + (count % partition_max_size != 0)
+            repr_files_as_tuple = tuple(repr_files.items())
+            for i in range(n_parts):
+                part = repr_files_as_tuple[i * partition_max_size: (i + 1) * partition_max_size]
+                for in_file, out_file in part: # add the partition subdir
+                    new_symlinks_to_do[in_file] = out_file.parent / f"part{i}" / out_file.name
+    assert (a := len(new_symlinks_to_do)) == (b := len(symlinks_to_do)), (a, b)
+    return new_symlinks_to_do
+
 def read_txt_data(txt_file: Path) -> list[tuple[str, str]]:
     """reads the data from the txt file with format scene/stem"""
     f = open(txt_file, "r")
@@ -66,6 +90,7 @@ def get_args() -> Namespace:
     parser.add_argument("--output_path", "-o", type=lambda p: Path(p).absolute())
     parser.add_argument("--overwrite", action="store_true")
     parser.add_argument("--copy_files", action="store_true")
+    parser.add_argument("--partition_max_size", type=int, default=10000) # thanks huggingface for this
     args = parser.parse_args()
     assert not args.output_path.exists() or args.overwrite, f"'{args.output_path}' exists. Use --overwrite."
     if args.output_path.exists():
@@ -80,6 +105,7 @@ def main(args: Namespace):
     args.output_path.mkdir(exist_ok=False, parents=True)
     txt_data = read_txt_data(args.txt_file)
     symlinks_to_do = check_and_gather_all_files(args.dataset_dir, txt_data, args.output_path, suffix=".npz")
+    symlinks_to_do = make_partitions_if_needed(symlinks_to_do, args.partition_max_size)
     for in_file, out_file in tqdm(symlinks_to_do.items(), desc="symlinks"):
         Path(out_file).parent.mkdir(exist_ok=True, parents=True)
         if args.copy_files: