little fixes for vre/vre_collage

scripts/semantic_mapper/semantic_mapper.py

@@ -305,8 +305,12 @@ class SafeLandingAreas(BinaryMapper):
             where_safe = sema_safe * where_safe
         return self.disk_to_memory_fmt(where_safe)
 
-def get_new_semantic_mapped_tasks(tasks_subset: list[str] | None = None) -> dict[str, TaskMapper]:
-    """The exported function for VRE!"""
+def get_new_semantic_mapped_tasks(tasks_subset: list[str] | None = None,
+                                  include_semantic_output: bool = False) -> dict[str, TaskMapper]:
+    """
+    The exported function for VRE! Note, semantic_output is also in dronescapes_representations so it can fail 
+    if used with vre or vre_collage --external_representations. So we default it to false.
+    """
     buildings_mapping = [
         {
             "others": [x for x in mapillary_classes if x not in
@@ -419,8 +423,6 @@ def get_new_semantic_mapped_tasks(tasks_subset: list[str] | None = None) -> dict
             "semantic_mask2former_r50_mapillary_converted", [m2f_r50_mapillary]),
         m2f_swin_coco_converted := SemanticMask2FormerCOCOConverted(
             "semantic_mask2former_swin_coco_converted", [m2f_coco]),
-        SemanticMedian("semantic_output", [m2f_swin_mapillary_converted, m2f_r50_mapillary_converted,
-                                           m2f_swin_coco_converted]),
         buildings := BinaryMapper("buildings", [m2f_mapillary, m2f_coco, m2f_r50_mapillary],
                                   buildings_mapping, mode="majority"),
         BinaryMapper("sky-and-water", [m2f_mapillary, m2f_coco, m2f_r50_mapillary],
@@ -435,6 +437,12 @@ def get_new_semantic_mapped_tasks(tasks_subset: list[str] | None = None) -> dict
                          original_classes=[mapillary_classes, coco_classes, mapillary_classes],
                          semantics=[m2f_mapillary, m2f_coco, m2f_r50_mapillary]),
     ]
+    if include_semantic_output:
+        available_tasks.append(
+            SemanticMedian("semantic_output", [m2f_swin_mapillary_converted, m2f_r50_mapillary_converted,
+                                               m2f_swin_coco_converted]),
+        )
+
     if tasks_subset is None:
         return {t.name: t for t in available_tasks}
     return {t.name: t for t in available_tasks if t.name in tasks_subset}
@@ -456,7 +464,7 @@ if __name__ == "__main__":
                               cache_task_stats=True, batch_size_stats=100)
     orig_task_names = list(reader.task_types.keys())
 
-    new_tasks = get_new_semantic_mapped_tasks()
+    new_tasks = get_new_semantic_mapped_tasks(include_semantic_output=True)
     for task_name in reader.task_names:
         if task_name not in orig_task_names:
             reader.remove_task(task_name)

vre_dronescapes/cfg.yaml

@@ -2,13 +2,13 @@ default_io_parameters:
   binary_format: npz
   image_format: not-set
   compress: True
-
+  output_size: [540, 960]
+ 
 default_learned_parameters:
   device: ${oc.env:VRE_DEVICE,cpu}
 
 default_compute_parameters:
   batch_size: 15
-  output_size: [540, 960]
 
 representations:
   rgb:
@@ -71,5 +71,5 @@ representations:
       sensor_width: 3840
       sensor_height: 2160
       window_size: 11
-    compute_parameters:
+    io_parameters:
       output_dtype: float16