Faster fast-orthophoto

opendm/config.py

@@ -795,8 +795,4 @@ def config(argv=None, parser=None):
             log.ODM_ERROR("Cluster node seems to be offline: %s"  % str(e))
             sys.exit(1)
     
-    # if args.radiometric_calibration != "none" and not args.texturing_skip_global_seam_leveling:
-    #     log.ODM_WARNING("radiometric-calibration is turned on, automatically setting --texturing-skip-global-seam-leveling")
-    #     args.texturing_skip_global_seam_leveling = True
-
     return args

stages/odm_georeferencing.py

@@ -137,7 +137,7 @@ class ODMGeoreferencingStage(types.ODM_Stage):
                     cropper = Cropper(tree.odm_georeferencing, 'odm_georeferenced_model')
                     
                     if args.fast_orthophoto:
-                        decimation_step = 10
+                        decimation_step = 4
                     else:
                         decimation_step = 40
                     

stages/odm_meshing.py

@@ -56,10 +56,9 @@ class ODMeshingStage(types.ODM_Stage):
               
               dsm_radius = dsm_resolution * math.sqrt(2)
 
-              # Sparse point clouds benefits from using
-              # a larger radius interolation --> less holes
               if args.fast_orthophoto:
                   dsm_radius *= 2
+                  dsm_resolution *= 8
 
               log.ODM_INFO('ODM 2.5D DSM resolution: %s' % dsm_resolution)
               
@@ -72,7 +71,7 @@ class ODMeshingStage(types.ODM_Stage):
                     verbose=self.params.get('verbose'),
                     available_cores=args.max_concurrency,
                     method='poisson' if args.fast_orthophoto else 'gridded',
-                    smooth_dsm=not args.fast_orthophoto)
+                    smooth_dsm=True)
           else:
               log.ODM_WARNING('Found a valid ODM 2.5D Mesh file in: %s' %
                               tree.odm_25dmesh)

stages/openmvs.py

@@ -90,9 +90,9 @@ class ODMOpenMVSStage(types.ODM_Stage):
             try:
                 run_densify()
             except system.SubprocessException as e:
-                # On Windows if the GPU was enabled and the program failed,
+                # If the GPU was enabled and the program failed,
                 # try to run it again without GPU
-                if sys.platform == 'win32' and len(gpu_config) == 0:
+                if e.errorCode == 1 and len(gpu_config) == 0:
                     log.ODM_WARNING("OpenMVS failed with GPU, is your graphics card driver up to date? Falling back to CPU.")
                     gpu_config.append("--cuda-device -1")
                     run_densify()