update inputs to colmap 3.13.3

colmap_mapper.sh

@@ -81,65 +81,65 @@ database="${exp_folder_colmap}/colmap_database.db"
 colmap mapper \
     --database_path ${database} \
     --image_path ${rgb_path} \
-    --output_path ${exp_folder_colmap} \
-    --Mapper.min_num_matches ${mapper_Mapper_min_num_matches} \
-    --Mapper.ignore_watermarks ${mapper_Mapper_ignore_watermarks} \
-    --Mapper.multiple_models ${mapper_Mapper_multiple_models} \
-    --Mapper.max_num_models ${mapper_Mapper_max_num_models} \
-    --Mapper.max_model_overlap ${mapper_Mapper_max_model_overlap} \
-    --Mapper.min_model_size ${mapper_Mapper_min_model_size} \
-    --Mapper.init_image_id1 ${mapper_Mapper_init_image_id1} \
-    --Mapper.init_image_id2 ${mapper_Mapper_init_image_id2} \
-    --Mapper.init_num_trials ${mapper_Mapper_init_num_trials} \
-    --Mapper.extract_colors ${mapper_Mapper_extract_colors} \
-    --Mapper.num_threads ${mapper_Mapper_num_threads} \
-    --Mapper.min_focal_length_ratio ${mapper_Mapper_min_focal_length_ratio} \
-    --Mapper.max_focal_length_ratio ${mapper_Mapper_max_focal_length_ratio} \
-    --Mapper.max_extra_param ${mapper_Mapper_max_extra_param} \
-    --Mapper.ba_refine_focal_length ${mapper_Mapper_ba_refine_focal_length} \
-    --Mapper.ba_refine_principal_point ${mapper_Mapper_ba_refine_principal_point} \
-    --Mapper.ba_refine_extra_params ${mapper_Mapper_ba_refine_extra_params} \
-    --Mapper.ba_local_num_images ${mapper_Mapper_ba_local_num_images} \
-    --Mapper.ba_local_function_tolerance ${mapper_Mapper_ba_local_function_tolerance} \
-    --Mapper.ba_local_max_num_iterations ${mapper_Mapper_ba_local_max_num_iterations} \
-    --Mapper.ba_global_images_ratio ${mapper_Mapper_ba_global_images_ratio} \
-    --Mapper.ba_global_points_ratio ${mapper_Mapper_ba_global_points_ratio} \
-    --Mapper.ba_global_images_freq ${mapper_Mapper_ba_global_images_freq} \
-    --Mapper.ba_global_points_freq ${mapper_Mapper_ba_global_points_freq} \
-    --Mapper.ba_global_function_tolerance ${mapper_Mapper_ba_global_function_tolerance} \
-    --Mapper.ba_global_max_num_iterations ${mapper_Mapper_ba_global_max_num_iterations} \
-    --Mapper.ba_global_max_refinements ${mapper_Mapper_ba_global_max_refinements} \
-    --Mapper.ba_global_max_refinement_change ${mapper_Mapper_ba_global_max_refinement_change} \
-    --Mapper.ba_local_max_refinements ${mapper_Mapper_ba_local_max_refinements} \
-    --Mapper.ba_local_max_refinement_change ${mapper_Mapper_ba_local_max_refinement_change} \
-    --Mapper.ba_use_gpu ${mapper_Mapper_ba_use_gpu} \
-    --Mapper.ba_gpu_index ${mapper_Mapper_ba_gpu_index} \
-    --Mapper.ba_min_num_residuals_for_cpu_multi_threading ${mapper_Mapper_ba_min_num_residuals_for_cpu_multi_threading} \
-    --Mapper.snapshot_images_freq ${mapper_Mapper_snapshot_images_freq} \
-    --Mapper.fix_existing_images ${mapper_Mapper_fix_existing_images} \
-    --Mapper.init_min_num_inliers ${mapper_Mapper_init_min_num_inliers} \
-    --Mapper.init_max_error ${mapper_Mapper_init_max_error} \
-    --Mapper.init_max_forward_motion ${mapper_Mapper_init_max_forward_motion} \
-    --Mapper.init_min_tri_angle ${mapper_Mapper_init_min_tri_angle} \
-    --Mapper.init_max_reg_trials ${mapper_Mapper_init_max_reg_trials} \
-    --Mapper.abs_pose_max_error ${mapper_Mapper_abs_pose_max_error} \
-    --Mapper.abs_pose_min_num_inliers ${mapper_Mapper_abs_pose_min_num_inliers} \
-    --Mapper.abs_pose_min_inlier_ratio ${mapper_Mapper_abs_pose_min_inlier_ratio} \
-    --Mapper.filter_max_reproj_error ${mapper_Mapper_filter_max_reproj_error} \
-    --Mapper.filter_min_tri_angle ${mapper_Mapper_filter_min_tri_angle} \
-    --Mapper.max_reg_trials ${mapper_Mapper_max_reg_trials} \
-    --Mapper.local_ba_min_tri_angle ${mapper_Mapper_local_ba_min_tri_angle} \
-    --Mapper.tri_max_transitivity ${mapper_Mapper_tri_max_transitivity} \
-    --Mapper.tri_create_max_angle_error ${mapper_Mapper_tri_create_max_angle_error} \
-    --Mapper.tri_continue_max_angle_error ${mapper_Mapper_tri_continue_max_angle_error} \
-    --Mapper.tri_merge_max_reproj_error ${mapper_Mapper_tri_merge_max_reproj_error} \
-    --Mapper.tri_complete_max_reproj_error ${mapper_Mapper_tri_complete_max_reproj_error} \
-    --Mapper.tri_complete_max_transitivity ${mapper_Mapper_tri_complete_max_transitivity} \
-    --Mapper.tri_re_max_angle_error ${mapper_Mapper_tri_re_max_angle_error} \
-    --Mapper.tri_re_min_ratio ${mapper_Mapper_tri_re_min_ratio} \
-    --Mapper.tri_re_max_trials ${mapper_Mapper_tri_re_max_trials} \
-    --Mapper.tri_min_angle ${mapper_Mapper_tri_min_angle} \
-    --Mapper.tri_ignore_two_view_tracks ${mapper_Mapper_tri_ignore_two_view_tracks}
+    --output_path ${exp_folder_colmap} #\
+    # --Mapper.min_num_matches ${mapper_Mapper_min_num_matches} \
+    # --Mapper.ignore_watermarks ${mapper_Mapper_ignore_watermarks} \
+    # --Mapper.multiple_models ${mapper_Mapper_multiple_models} \
+    # --Mapper.max_num_models ${mapper_Mapper_max_num_models} \
+    # --Mapper.max_model_overlap ${mapper_Mapper_max_model_overlap} \
+    # --Mapper.min_model_size ${mapper_Mapper_min_model_size} \
+    # --Mapper.init_image_id1 ${mapper_Mapper_init_image_id1} \
+    # --Mapper.init_image_id2 ${mapper_Mapper_init_image_id2} \
+    # --Mapper.init_num_trials ${mapper_Mapper_init_num_trials} \
+    # --Mapper.extract_colors ${mapper_Mapper_extract_colors} \
+    # --Mapper.num_threads ${mapper_Mapper_num_threads} \
+    # --Mapper.min_focal_length_ratio ${mapper_Mapper_min_focal_length_ratio} \
+    # --Mapper.max_focal_length_ratio ${mapper_Mapper_max_focal_length_ratio} \
+    # --Mapper.max_extra_param ${mapper_Mapper_max_extra_param} \
+    # --Mapper.ba_refine_focal_length ${mapper_Mapper_ba_refine_focal_length} \
+    # --Mapper.ba_refine_principal_point ${mapper_Mapper_ba_refine_principal_point} \
+    # --Mapper.ba_refine_extra_params ${mapper_Mapper_ba_refine_extra_params} \
+    # --Mapper.ba_local_num_images ${mapper_Mapper_ba_local_num_images} \
+    # --Mapper.ba_local_function_tolerance ${mapper_Mapper_ba_local_function_tolerance} \
+    # --Mapper.ba_local_max_num_iterations ${mapper_Mapper_ba_local_max_num_iterations} \
+    # --Mapper.ba_global_images_ratio ${mapper_Mapper_ba_global_images_ratio} \
+    # --Mapper.ba_global_points_ratio ${mapper_Mapper_ba_global_points_ratio} \
+    # --Mapper.ba_global_images_freq ${mapper_Mapper_ba_global_images_freq} \
+    # --Mapper.ba_global_points_freq ${mapper_Mapper_ba_global_points_freq} \
+    # --Mapper.ba_global_function_tolerance ${mapper_Mapper_ba_global_function_tolerance} \
+    # --Mapper.ba_global_max_num_iterations ${mapper_Mapper_ba_global_max_num_iterations} \
+    # --Mapper.ba_global_max_refinements ${mapper_Mapper_ba_global_max_refinements} \
+    # --Mapper.ba_global_max_refinement_change ${mapper_Mapper_ba_global_max_refinement_change} \
+    # --Mapper.ba_local_max_refinements ${mapper_Mapper_ba_local_max_refinements} \
+    # --Mapper.ba_local_max_refinement_change ${mapper_Mapper_ba_local_max_refinement_change} \
+    # --Mapper.ba_use_gpu ${mapper_Mapper_ba_use_gpu} \
+    # --Mapper.ba_gpu_index ${mapper_Mapper_ba_gpu_index} \
+    # --Mapper.ba_min_num_residuals_for_cpu_multi_threading ${mapper_Mapper_ba_min_num_residuals_for_cpu_multi_threading} \
+    # --Mapper.snapshot_images_freq ${mapper_Mapper_snapshot_images_freq} \
+    # --Mapper.fix_existing_images ${mapper_Mapper_fix_existing_images} \
+    # --Mapper.init_min_num_inliers ${mapper_Mapper_init_min_num_inliers} \
+    # --Mapper.init_max_error ${mapper_Mapper_init_max_error} \
+    # --Mapper.init_max_forward_motion ${mapper_Mapper_init_max_forward_motion} \
+    # --Mapper.init_min_tri_angle ${mapper_Mapper_init_min_tri_angle} \
+    # --Mapper.init_max_reg_trials ${mapper_Mapper_init_max_reg_trials} \
+    # --Mapper.abs_pose_max_error ${mapper_Mapper_abs_pose_max_error} \
+    # --Mapper.abs_pose_min_num_inliers ${mapper_Mapper_abs_pose_min_num_inliers} \
+    # --Mapper.abs_pose_min_inlier_ratio ${mapper_Mapper_abs_pose_min_inlier_ratio} \
+    # --Mapper.filter_max_reproj_error ${mapper_Mapper_filter_max_reproj_error} \
+    # --Mapper.filter_min_tri_angle ${mapper_Mapper_filter_min_tri_angle} \
+    # --Mapper.max_reg_trials ${mapper_Mapper_max_reg_trials} \
+    # --Mapper.local_ba_min_tri_angle ${mapper_Mapper_local_ba_min_tri_angle} \
+    # --Mapper.tri_max_transitivity ${mapper_Mapper_tri_max_transitivity} \
+    # --Mapper.tri_create_max_angle_error ${mapper_Mapper_tri_create_max_angle_error} \
+    # --Mapper.tri_continue_max_angle_error ${mapper_Mapper_tri_continue_max_angle_error} \
+    # --Mapper.tri_merge_max_reproj_error ${mapper_Mapper_tri_merge_max_reproj_error} \
+    # --Mapper.tri_complete_max_reproj_error ${mapper_Mapper_tri_complete_max_reproj_error} \
+    # --Mapper.tri_complete_max_transitivity ${mapper_Mapper_tri_complete_max_transitivity} \
+    # --Mapper.tri_re_max_angle_error ${mapper_Mapper_tri_re_max_angle_error} \
+    # --Mapper.tri_re_min_ratio ${mapper_Mapper_tri_re_min_ratio} \
+    # --Mapper.tri_re_max_trials ${mapper_Mapper_tri_re_max_trials} \
+    # --Mapper.tri_min_angle ${mapper_Mapper_tri_min_angle} \
+    # --Mapper.tri_ignore_two_view_tracks ${mapper_Mapper_tri_ignore_two_view_tracks}
 
 
 echo "    colmap model_converter ..."

colmap_matcher.sh

@@ -63,14 +63,14 @@ colmap feature_extractor \
    --ImageReader.camera_model SIMPLE_PINHOLE \
    --ImageReader.single_camera 1 \
    --ImageReader.single_camera_per_folder 1 \
-   --SiftExtraction.use_gpu ${use_gpu} \
-   --SiftExtraction.num_octaves ${feature_extractor_SiftExtraction_num_octaves} \
-   --SiftExtraction.octave_resolution ${feature_extractor_SiftExtraction_octave_resolution} \
-   --SiftExtraction.peak_threshold ${feature_extractor_SiftExtraction_peak_threshold} \
-   --SiftExtraction.edge_threshold ${feature_extractor_SiftExtraction_edge_threshold} \
-   --SiftExtraction.dsp_min_scale ${feature_extractor_SiftExtraction_dsp_min_scale} \
-   --SiftExtraction.dsp_max_scale ${feature_extractor_SiftExtraction_dsp_max_scale} \
-   --SiftExtraction.dsp_num_scales ${feature_extractor_SiftExtraction_dsp_num_scales}
+   --FeatureExtraction.use_gpu ${use_gpu}
+  #  --SiftExtraction.num_octaves ${feature_extractor_SiftExtraction_num_octaves} \
+  #  --SiftExtraction.octave_resolution ${feature_extractor_SiftExtraction_octave_resolution} \
+  #  --SiftExtraction.peak_threshold ${feature_extractor_SiftExtraction_peak_threshold} \
+  #  --SiftExtraction.edge_threshold ${feature_extractor_SiftExtraction_edge_threshold} \
+  #  --SiftExtraction.dsp_min_scale ${feature_extractor_SiftExtraction_dsp_min_scale} \
+  #  --SiftExtraction.dsp_max_scale ${feature_extractor_SiftExtraction_dsp_max_scale} \
+  #  --SiftExtraction.dsp_num_scales ${feature_extractor_SiftExtraction_dsp_num_scales}
 fi
 
 if [ "${calibration_model}" == "Pinhole" ]
@@ -83,7 +83,7 @@ then
 	--ImageReader.camera_model PINHOLE \
 	--ImageReader.single_camera 1 \
 	--ImageReader.single_camera_per_folder 1 \
-	--SiftExtraction.use_gpu ${use_gpu} \
+	--FeatureExtraction.use_gpu ${use_gpu} \
 	--ImageReader.camera_params "${fx}, ${fy}, ${cx}, ${cy}" \
   --SiftExtraction.num_octaves ${feature_extractor_SiftExtraction_num_octaves} \
   --SiftExtraction.octave_resolution ${feature_extractor_SiftExtraction_octave_resolution} \
@@ -111,7 +111,7 @@ then
 	--ImageReader.camera_model ${calibration_model} \
 	--ImageReader.single_camera 1 \
   --ImageReader.single_camera_per_folder 1 \
-	--SiftExtraction.use_gpu ${use_gpu} \
+	--FeatureExtraction.use_gpu ${use_gpu} \
 	--ImageReader.camera_params "${fx}, ${fy}, ${cx}, ${cy}, ${k1}, ${k2}, ${p1}, ${p2}" \
   --SiftExtraction.num_octaves ${feature_extractor_SiftExtraction_num_octaves} \
   --SiftExtraction.octave_resolution ${feature_extractor_SiftExtraction_octave_resolution} \
@@ -138,7 +138,7 @@ then
 	--ImageReader.camera_model ${calibration_model} \
 	--ImageReader.single_camera 1 \
 	--ImageReader.single_camera_per_folder 1 \
-	--SiftExtraction.use_gpu ${use_gpu} \
+	--FeatureExtraction.use_gpu ${use_gpu} \
 	--ImageReader.camera_params "${fx}, ${fy}, ${cx}, ${cy}, ${k1}, ${k2}, ${k3}, ${k4}" \
   --SiftExtraction.num_octaves ${feature_extractor_SiftExtraction_num_octaves} \
   --SiftExtraction.octave_resolution ${feature_extractor_SiftExtraction_octave_resolution} \
@@ -155,7 +155,7 @@ then
 	echo "    colmap exhaustive_matcher ..."
   colmap exhaustive_matcher \
      --database_path ${database} \
-     --SiftMatching.use_gpu ${use_gpu} \
+     --FeatureMatching.use_gpu ${use_gpu} \
      --SiftMatching.max_ratio "${matcher_SiftMatching_max_ratio}" \
      --SiftMatching.max_distance "${matcher_SiftMatching_max_distance}" \
      --TwoViewGeometry.min_num_inliers "${matcher_TwoViewGeometry_min_num_inliers}" \
@@ -186,7 +186,7 @@ then
     --database_path "${database}" \
     --SequentialMatching.loop_detection 1 \
     --SequentialMatching.vocab_tree_path ${vocabulary_tree} \
-    --SiftMatching.use_gpu "${use_gpu}" \
+    --FeatureMatching.use_gpu "${use_gpu}" \
     --SiftMatching.max_ratio "${matcher_SiftMatching_max_ratio}" \
     --SiftMatching.max_distance "${matcher_SiftMatching_max_distance}" \
     --TwoViewGeometry.min_num_inliers "${matcher_TwoViewGeometry_min_num_inliers}" \