various fixes

scripts/dronescapes_viewer/dronescapes_representations.py

@@ -13,7 +13,7 @@ def get_gt_tasks() -> dict[str, Representation]:
                 [255, 0, 0], [0, 0, 255], [0, 255, 255], [127, 127, 63]]
     classes_8 = ["land", "forest", "residential", "road", "little-objects", "water", "sky", "hill"]
     tasks = [
-        SemanticRepresentation("semantic_output", classes=classes_8, color_map=color_map, disk_data_argmax=True),
+        SemanticRepresentation("semantic_output", classes=classes_8, color_map=color_map, semantic_argmax_only=True),
         DepthRepresentation("depth_output", min_depth=0, max_depth=300),
         NormalsRepresentation("camera_normals_output"),
     ]

scripts/semantic_mapper/semantic_mapper.py

@@ -97,11 +97,11 @@ mapillary_color_map = [[165, 42, 42], [0, 192, 0], [196, 196, 196], [190, 153, 1
                        [0, 0, 70], [0, 0, 192], [32, 32, 32], [120, 10, 10]]
 
 m2f_coco = SemanticRepresentation("semantic_mask2former_coco_47429163_0", classes=coco_classes,
-                                  color_map=coco_color_map, disk_data_argmax=True)
+                                  color_map=coco_color_map, semantic_argmax_only=True)
 m2f_mapillary = SemanticRepresentation("semantic_mask2former_mapillary_49189528_0", classes=mapillary_classes,
-                                       color_map=mapillary_color_map, disk_data_argmax=True)
+                                       color_map=mapillary_color_map, semantic_argmax_only=True)
 m2f_r50_mapillary = SemanticRepresentation("semantic_mask2former_mapillary_49189528_1", classes=mapillary_classes,
-                                           color_map=mapillary_color_map, disk_data_argmax=True)
+                                           color_map=mapillary_color_map, semantic_argmax_only=True)
 marigold = DepthRepresentation("depth_marigold", min_depth=0, max_depth=1)
 normals_svd_marigold = NormalsRepresentation("normals_svd(depth_marigold)")
 

vre_dronescapes/cfg.yaml

@@ -30,7 +30,7 @@ representations:
     dependencies: []
     parameters:
       model_id: "47429163_0"
-      disk_data_argmax: True
+      semantic_argmax_only: True
     compute_parameters:
       batch_size: 1
 
@@ -39,7 +39,7 @@ representations:
     dependencies: []
     parameters:
       model_id: "49189528_0"
-      disk_data_argmax: True
+      semantic_argmax_only: True
     compute_parameters:
       batch_size: 1
 
@@ -48,7 +48,7 @@ representations:
     dependencies: []
     parameters:
       model_id: "49189528_1"
-      disk_data_argmax: True
+      semantic_argmax_only: True
     compute_parameters:
       batch_size: 1
 

vre_dronescapes/commands.txt

@@ -33,7 +33,7 @@ VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=7 vre ../raw_data/videos/olanesti_DJI_0416_
 # new videos
 
 tmux new -s norway2
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=1 vre ../raw_data/videos/new_videos/norway_DJI_0708_540p.mp4 -o norway_DJI_0708_540p.mp4/ --config_path cfg.yaml --output_dir_exists_mode skip_computed --exception_mode skip_representation --n_threads_data_storer 4 -I ../scripts/semantic_mapper/semantic_mapper.py:get_new_semantic_mapped_tasks
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=1 vre ../raw_data/videos/new_videos/norway_DJI_0708_540p.mp4 -o norway_DJI_0708_540p --config_path cfg.yaml --output_dir_exists_mode skip_computed --exception_mode skip_representation --n_threads_data_storer 4 -I ../scripts/semantic_mapper/semantic_mapper.py:get_new_semantic_mapped_tasks
 
 tmux new -s politehnica
 VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=2 vre ../raw_data/videos/new_videos/politehnica_DJI_0741_a2_540p.mp4 -o politehnica_DJI_0741_a2_540p/ --config_path cfg.yaml --output_dir_exists_mode skip_computed --exception_mode skip_representation --n_threads_data_storer 4 -I ../scripts/semantic_mapper/semantic_mapper.py:get_new_semantic_mapped_tasks
@@ -69,9 +69,9 @@ python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_fil
 
 # experts (make combined txt file of all new scenes + old data)
 # in vre_dronescapes_dir
-ls . | grep "norway_DJI_0708_540p.mp4\|politehnica_DJI_0741_a2_540p\|ovaselu_DJI_0372_540p\|raciu_DJI_0418_540p\|sanfrancisco_youtube_1_540p\|paris_youtube_1_540p\|riodejaneiro_youtube_1_540p\|sheerness_youtube_1_540p" | while read line; do rm -f ../scripts/txt_files/experts/"$line".txt; ls -v $line/rgb/npz | while read line2; do stem=${line2:0:-4}; echo $line/$stem >> ../scripts/txt_files/experts/"$line".txt; done; done
-ls . | grep "norway_DJI_0708_540p.mp4\|politehnica_DJI_0741_a2_540p\|ovaselu_DJI_0372_540p\|raciu_DJI_0418_540p\|sanfrancisco_youtube_1_540p\|paris_youtube_1_540p\|riodejaneiro_youtube_1_540p\|sheerness_youtube_1_540p" | while read line; do echo $line; cp -r $line/depth_marigold $line/depth_output; ../scripts/update_stastistics.py $line/depth_output/npz --statistics_file  ../data/train_set/.task_statistics.npz --source_task depth_marigold --n_workers 32; cp -r $line/'normals_svd(depth_marigold)' $line/camera_normals_output; done
+ls . | grep "norway_DJI_0708_540p\|politehnica_DJI_0741_a2_540p\|ovaselu_DJI_0372_540p\|raciu_DJI_0418_540p\|sanfrancisco_youtube_1_540p\|paris_youtube_1_540p\|riodejaneiro_youtube_1_540p\|sheerness_youtube_1_540p" | while read line; do echo $line; cp -r $line/depth_marigold $line/depth_output; ../scripts/update_stastistics.py $line/depth_output/npz --statistics_file  ../data/train_set/.task_statistics.npz --source_task depth_marigold --n_workers 32; cp -r $line/'normals_svd(depth_marigold)' $line/camera_normals_output; done
 mkdir ../scripts/txt_files/experts # in root dir
+ls . | grep "norway_DJI_0708_540p\|politehnica_DJI_0741_a2_540p\|ovaselu_DJI_0372_540p\|raciu_DJI_0418_540p\|sanfrancisco_youtube_1_540p\|paris_youtube_1_540p\|riodejaneiro_youtube_1_540p\|sheerness_youtube_1_540p" | while read line; do rm -f ../scripts/txt_files/experts/"$line".txt; ls -v $line/rgb/npz | while read line2; do stem=${line2:0:-4}; echo $line/$stem >> ../scripts/txt_files/experts/"$line".txt; done; done
 cd ../scripts/txt_files/experts # move to txt files dir
 cat ../annotated_and_segprop/train_files_11664.txt > train_set.txt
 cat ../annotated_and_segprop/semisup_files_11299.txt >> train_set.txt