various fixes due to vre 1.8.0

scripts/semantic_mapper/semantic_mapper.py

@@ -139,7 +139,7 @@ class SemanticMask2FormerMapillaryConvertedPaper(TaskMapper, NpIORepresentation)
 
     @overrides
     def merge_fn(self, dep_data: list[MemoryData]) -> MemoryData:
-        m2f_mapillary = dep_data[0].argmax(-1)
+        m2f_mapillary = self.dependencies[0].to_argmaxed_representation(dep_data[0])
         m2f_mapillary_converted = semantic_mapper(m2f_mapillary, self.mapping, self.original_classes)
         return self.disk_to_memory_fmt(m2f_mapillary_converted)
 
@@ -198,7 +198,7 @@ class SemanticMask2FormerCOCOConverted(TaskMapper, NpIORepresentation):
 
     @overrides
     def merge_fn(self, dep_data: list[MemoryData]) -> MemoryData:
-        m2f_mapillary = dep_data[0].argmax(-1)
+        m2f_mapillary = self.dependencies[0].to_argmaxed_representation(dep_data[0])
         m2f_mapillary_converted = semantic_mapper(m2f_mapillary, self.mapping, self.original_classes)
         res = self.disk_to_memory_fmt(m2f_mapillary_converted)
         return res
@@ -252,8 +252,13 @@ class BinaryMapper(TaskMapper, NpIORepresentation):
 
     @overrides
     def merge_fn(self, dep_data: list[MemoryData]) -> MemoryData:
-        dep_data_converted = [semantic_mapper(x.argmax(-1), mapping, oc)
-                              for x, mapping, oc in zip(dep_data, self.mapping, self.original_classes)]
+        dep_data_argmaxed = []
+        for dep, data in zip(self.dependencies, dep_data):
+            assert isinstance(dep, SemanticRepresentation), type(dep)
+            dep_data_argmaxed.append(dep.to_argmaxed_representation(data))
+        dep_data_converted = [semantic_mapper(x, mapping, oc)
+                              for x, mapping, oc in zip(dep_data_argmaxed, self.mapping, self.original_classes)]
+
         if self.mode == "all_agree":
             res_argmax = sum(dep_data_converted) == len(self.dependencies)
         elif self.mode == "at_least_one":

vre_dronescapes/commands.txt

@@ -1,10 +1,10 @@
 # Run VRE on the raw videos (in vre_dronescapes dir)
 
 tmux new -s vre_atanasie
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=0 vre ../raw_data/videos/atanasie_DJI_0652_full/atanasie_DJI_0652_full_540p.mp4 -o atanasie_DJI_0652_full/ --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=0 vre ../raw_data/videos/atanasie_DJI_0652_full/atanasie_DJI_0652_full_540p.mp4 -o atanasie_DJI_0652_full/ --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 vre_barsana
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=1 vre ../raw_data/videos/barsana_DJI_0500_0501_combined_sliced_2700_14700/barsana_DJI_0500_0501_combined_sliced_2700_14700_540p.mp4 -o barsana_DJI_0500_0501_combined_sliced_2700_14700/ --config_path cfg.yaml --output_dir_exists_mode skip_computed --exception_mode skip_representation --n_threads_data_storer 4 "transportation" -I ../scripts/semantic_mapper/semantic_mapper.py:get_new_semantic_mapped_tasks
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=1 vre ../raw_data/videos/barsana_DJI_0500_0501_combined_sliced_2700_14700/barsana_DJI_0500_0501_combined_sliced_2700_14700_540p.mp4 -o barsana_DJI_0500_0501_combined_sliced_2700_14700/ --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 vre_comana
 VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=2 vre ../raw_data/videos/comana_DJI_0881_full/comana_DJI_0881_full_540p.mp4 -o comana_DJI_0881_full/ --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
@@ -19,50 +19,52 @@ tmux new -s vre_petrova
 VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=5 vre ../raw_data/videos/petrova_DJI_0525_0526_combined_sliced_2850_11850/petrova_DJI_0525_0526_combined_sliced_2850_11850_540p.mp4 -o petrova_DJI_0525_0526_combined_sliced_2850_11850/ --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 vre_norway
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=6 vre ../raw_data/videos/norway_210821_DJI_0015_full/norway_210821_DJI_0015_full_540p.mp4 -o norway_210821_DJI_0015_full/ --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=6 vre ../raw_data/videos/norway_210821_DJI_0015_full/norway_210821_DJI_0015_full_540p.mp4 -o norway_210821_DJI_0015_full/ --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 vre_slanic
 VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=6 vre ../raw_data/videos/slanic_DJI_0956_0957_combined_sliced_780_9780/slanic_DJI_0956_0957_combined_sliced_780_9780_540p.mp4 -o slanic_DJI_0956_0957_combined_sliced_780_9780/ --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 vre_jupiter
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=7 vre ../raw_data/videos/jupiter_DJI_0703_0704_0705_combined_sliced_10650_21715/jupiter_DJI_0703_0704_0705_combined_sliced_10650_21715_540p.mp4 -o jupiter_DJI_0703_0704_0705_combined_sliced_10650_21715/ --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=7 vre ../raw_data/videos/jupiter_DJI_0703_0704_0705_combined_sliced_10650_21715/jupiter_DJI_0703_0704_0705_combined_sliced_10650_21715_540p.mp4 -o jupiter_DJI_0703_0704_0705_combined_sliced_10650_21715/ --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 vre_olanesti
 VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=7 vre ../raw_data/videos/olanesti_DJI_0416_full/olanesti_DJI_0416_full_540p.mp4 -o olanesti_DJI_0416_full/ --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
 
-# Split dataset in the relevant 8 splits (in root dir)
-
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/train_files_11664.txt -o data/train_set
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/val_files_605.txt -o data/validation_set
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/semisup_files_11299.txt -o data/semisupervised_set
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/test_files_5603.txt -o data/test_set
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/train_files_218.txt -o data/train_set_annotated_only
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/val_files_15.txt -o data/validation_set_annotated_only
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/semisup_files_207.txt -o data/semisupervised_set_annotated_only
-python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/test_files_116.txt -o data/test_set_annotated_only
-
 # new videos
 
 tmux new -s norway2
 VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=1 vre ../raw_data/videos/new_videos/norway_DJI_0741_540p.mp4 -o norway_DJI_0741_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;
+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
 
 tmux new -s ovaselu
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=3 vre ../raw_data/videos/new_videos/ovaselu_DJI_0372_540p.mp4 -o ovaselu_DJI_0372_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;
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=3 vre ../raw_data/videos/new_videos/ovaselu_DJI_0372_540p.mp4 -o ovaselu_DJI_0372_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 raciu
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=4 vre ../raw_data/videos/new_videos/raciu_DJI_0418_540p.mp4 -o raciu_DJI_0418_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;
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=4 vre ../raw_data/videos/new_videos/raciu_DJI_0418_540p.mp4 -o raciu_DJI_0418_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 sf
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=5 vre ../raw_data/videos/new_videos/sanfrancisco_youtube_1_540p.mp4 -o sanfrancisco_youtube_1_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;
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=5 vre ../raw_data/videos/new_videos/sanfrancisco_youtube_1_540p.mp4 -o sanfrancisco_youtube_1_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 paris
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=6 vre ../raw_data/videos/new_videos/paris_youtube_1_540p.mp4 -o paris_youtube_1_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;
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=6 vre ../raw_data/videos/new_videos/paris_youtube_1_540p.mp4 -o paris_youtube_1_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 rio
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=7 vre ../raw_data/videos/new_videos/riodejaneiro_youtube_1_540p.mp4 -o riodejaneiro_youtube_1_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;
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=7 vre ../raw_data/videos/new_videos/riodejaneiro_youtube_1_540p.mp4 -o riodejaneiro_youtube_1_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 rome
-VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=0 vre ../raw_data/videos/new_videos/rome_youtube_1_540p.mp4 -o rome_youtube_1_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;
+VRE_DEVICE=cuda CUDA_VISIBLE_DEVICES=0 vre ../raw_data/videos/new_videos/rome_youtube_1_540p.mp4 -o rome_youtube_1_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
+
+# Split dataset in the relevant 8 splits (in root dir)
+
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/train_files_11664.txt -o data/train_set
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/val_files_605.txt -o data/validation_set
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/semisup_files_11299.txt -o data/semisupervised_set
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/annotated_and_segprop/test_files_5603.txt -o data/test_set
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/train_files_218.txt -o data/train_set_annotated_only
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/val_files_15.txt -o data/validation_set_annotated_only
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/semisup_files_207.txt -o data/semisupervised_set_annotated_only
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/manually_annotated_files/test_files_116.txt -o data/test_set_annotated_only
+# TODO: experts
+python scripts/symlinks_from_txt_list.py vre_dronescapes/ --copy_files --txt_file scripts/txt_files/experts/train_set.txt -o data/train_set_experts