diff --git a/SuperBuild/cmake/External-FPCFilter.cmake b/SuperBuild/cmake/External-FPCFilter.cmake index 626f3c3d1..7ea672110 100644 --- a/SuperBuild/cmake/External-FPCFilter.cmake +++ b/SuperBuild/cmake/External-FPCFilter.cmake @@ -8,7 +8,7 @@ ExternalProject_Add(${_proj_name} #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} GIT_REPOSITORY https://github.com/OpenDroneMap/FPCFilter - GIT_TAG 320 + GIT_TAG 331 #--Update/Patch step---------- UPDATE_COMMAND "" #--Configure step------------- diff --git a/VERSION b/VERSION index 15a279981..bea438e9a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0 +3.3.1 diff --git a/stages/openmvs.py b/stages/openmvs.py index 8d5eb69e3..f3b50644d 100644 --- a/stages/openmvs.py +++ b/stages/openmvs.py @@ -65,7 +65,7 @@ def process(self, args, outputs): filter_point_th = -20 config = [ - " --resolution-level %s" % int(resolution_level), + "--resolution-level %s" % int(resolution_level), '--dense-config-file "%s"' % densify_ini_file, "--max-resolution %s" % int(outputs['undist_image_max_size']), "--max-threads %s" % args.max_concurrency, @@ -79,7 +79,6 @@ def process(self, args, outputs): gpu_config = [] use_gpu = has_gpu(args) if use_gpu: - #gpu_config.append("--cuda-device -3") gpu_config.append("--cuda-device -1") else: gpu_config.append("--cuda-device -2") @@ -101,6 +100,7 @@ def run_densify(): system.run('"%s" "%s" %s' % (context.omvs_densify_path, openmvs_scene_file, ' '.join(config + gpu_config + extra_config))) + try: run_densify() except system.SubprocessException as e: @@ -127,10 +127,10 @@ def run_densify(): subscene_densify_ini_file = os.path.join(tree.openmvs, 'subscene-config.ini') with open(subscene_densify_ini_file, 'w+') as f: - f.write("Optimize = 0\n") + f.write("Optimize = 0\nEstimation Geometric Iters = 0\n") config = [ - "--sub-scene-area 660000", + "--sub-scene-area 660000", # 8000 "--max-threads %s" % args.max_concurrency, '-w "%s"' % depthmaps_dir, "-v 0", @@ -161,9 +161,13 @@ def run_densify(): config = [ '--resolution-level %s' % int(resolution_level), '--max-resolution %s' % int(outputs['undist_image_max_size']), + "--sub-resolution-levels %s" % subres_levels, '--dense-config-file "%s"' % subscene_densify_ini_file, '--number-views-fuse %s' % number_views_fuse, '--max-threads %s' % args.max_concurrency, + '--archive-type 3', + '--postprocess-dmaps 0', + '--geometric-iters 0', '-w "%s"' % depthmaps_dir, '-v 0', ] @@ -179,7 +183,7 @@ def run_densify(): else: # Filter if args.pc_filter > 0: - system.run('"%s" "%s" --filter-point-cloud %s -v 0 %s' % (context.omvs_densify_path, scene_dense_mvs, filter_point_th, ' '.join(gpu_config))) + system.run('"%s" "%s" --filter-point-cloud %s -v 0 --archive-type 3 %s' % (context.omvs_densify_path, scene_dense_mvs, filter_point_th, ' '.join(gpu_config))) else: # Just rename log.ODM_INFO("Skipped filtering, %s --> %s" % (scene_ply_unfiltered, scene_ply))