little fixes and added depth_ufo plus edges_gb

dronescapes_reader/__init__.py

@@ -1,7 +1,7 @@
 """init file"""
 from .multitask_dataset import MultiTaskDataset, NpzRepresentation
 from .dronescapes_representations import DepthRepresentation, OpticalFlowRepresentation, SemanticRepresentation, \
-    ColorRepresentation
+    ColorRepresentation, EdgesRepresentation
 
 _color_map = [[0, 255, 0], [0, 127, 0], [255, 255, 0], [255, 255, 255],
               [255, 0, 0], [0, 0, 255], [0, 255, 255], [127, 127, 63]]
@@ -11,8 +11,10 @@ dronescapes_task_types = { # some pre-baked representations
     "edges_dexined": ColorRepresentation("edges_dexined"),
     "depth_dpt": DepthRepresentation("depth_dpt", min_depth=0, max_depth=0.999),
     "depth_sfm_manual202204": DepthRepresentation("depth_sfm_manual202204", min_depth=0, max_depth=300),
+    "depth_ufo": DepthRepresentation("depth_ufo", min_depth=0, max_depth=1),
     "opticalflow_rife": OpticalFlowRepresentation,
     "semantic_segprop8": SemanticRepresentation("semantic_segprop8", classes=8, color_map=_color_map),
     _m2f_name: SemanticRepresentation(_m2f_name, classes=8, color_map=_color_map),
     "softseg_gb": ColorRepresentation("softseg_gb"),
+    "edges_gb": EdgesRepresentation("edges_gb"),
 }

dronescapes_reader/dronescapes_representations.py

@@ -17,6 +17,15 @@ class ColorRepresentation(NpzRepresentation):
     def save_to_disk(self, data: tr.Tensor, path: Path):
         return super().save_to_disk((data * 255).byte(), path)
 
+class EdgesRepresentation(NpzRepresentation):
+    def load_from_disk(self, path: Path) -> tr.Tensor:
+        res = super().load_from_disk(path).float()
+        assert len(res.shape) == 3 and res.shape[-1] == 1
+        return res
+
+    def plot_fn(self, x: tr.Tensor) -> np.ndarray:
+        return (x.repeat(1, 1, 3) * 255).cpu().numpy().astype(np.uint8)
+
 class DepthRepresentation(NpzRepresentation):
     """DepthRepresentation. Implements depth task-specific stuff, like hotmap."""
     def __init__(self, *args, min_depth: float, max_depth: float, **kwargs):
@@ -27,11 +36,9 @@ class DepthRepresentation(NpzRepresentation):
 
     @overrides
     def plot_fn(self, x: tr.Tensor) -> np.ndarray:
-        x = x.detach().cpu().numpy()
-        x = np.clip(x, 0, 1)
-        y = hot(x.squeeze())[..., 0:3]
-        y = np.uint8(y * 255)
-        return y
+        x = x.detach().clip(0, 1).squeeze().cpu().numpy()
+        y: np.ndarray = hot(x)[..., 0:3] * 255
+        return y.astype(np.uint8)
 
     def load_from_disk(self, path: Path) -> tr.Tensor:
         res = super().load_from_disk(path)

dronescapes_reader/multitask_dataset.py

@@ -124,7 +124,7 @@ class MultiTaskDataset(Dataset):
             except Exception:
                 pass
             self._tasks.append(t)
-        assert all(t.name == t_n for t, t_n in zip(self._tasks, self.task_names)), (self._task_names, self._tasks)
+        assert all(t.name == t_n for t, t_n in zip(self._tasks, self.task_names)), (self.task_names, self._tasks)
         return self._tasks
 
     def collate_fn(self, items: list[MultiTaskItem]) -> MultiTaskItem:

scripts/lel.txt

@@ -0,0 +1,8 @@
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/annotated_and_segprop/train_files_11664.txt -o data/train_set --copy_files
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/annotated_and_segprop/semisup_files_11299.txt -o data/semisupervised_set --copy_files
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/annotated_and_segprop/test_files_5603.txt -o data/test_set --copy_files
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/annotated_and_segprop/val_files_605.txt -o data/validation_set --copy_files
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/manually_annotated_files/train_files_218.txt -o data/train_set_annotated_only --copy_files
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/manually_annotated_files/val_files_15.txt -o data/validation_set_annotated_only --copy_files
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/manually_annotated_files/semisup_files_207.txt -o data/semisupervised_set_annotated_nly --copy_files
+python scripts/symlinks_from_txt_list.py raw_data/npz_540p/ --txt_file raw_data/txt_files/manually_annotated_files/test_files_116.txt -o data/test_set_annotated_only --copy_files