Revert "Detect OpenMVS CUDA build"

This reverts commit c21ff9e6c2.

opendm/config.py

@@ -156,6 +156,12 @@ def config(argv=None, parser=None):
                             'Can be one of: %(choices)s. Default: '
                             '%(default)s'))
 
+    parser.add_argument('--3d-tiles',
+                        action=StoreTrue,
+                        nargs=0,
+                        default=False,
+                        help='Generate OGC 3D Tiles outputs. Default: %(default)s')
+
     parser.add_argument('--matcher-neighbors',
                         metavar='<positive integer>',
                         action=StoreValue,
@@ -608,12 +614,6 @@ def config(argv=None, parser=None):
                          'suitable for viewers like Leaflet or OpenLayers. '
                          'Default: %(default)s')
 
-    parser.add_argument('--3d-tiles',
-                        action=StoreTrue,
-                        nargs=0,
-                        default=False,
-                        help='Generate OGC 3D Tiles outputs. Default: %(default)s')
-
     parser.add_argument('--build-overviews',
                         action=StoreTrue,
                         nargs=0,

opendm/system.py

@@ -65,7 +65,7 @@ def sighandler(signum, frame):
 signal.signal(signal.SIGINT, sighandler)
 signal.signal(signal.SIGTERM, sighandler)
 
-def run(cmd, env_paths=[context.superbuild_bin_path], env_vars={}, packages_paths=context.python_packages_paths, on_output=None):
+def run(cmd, env_paths=[context.superbuild_bin_path], env_vars={}, packages_paths=context.python_packages_paths):
     """Run a system command"""
     global running_subprocesses
 
@@ -89,10 +89,7 @@ def run(cmd, env_paths=[context.superbuild_bin_path], env_vars={}, packages_path
     running_subprocesses.append(p)
     lines = deque()
     for line in io.TextIOWrapper(p.stdout):
-        if on_output is not None:
-            on_output(line)
-        else:
-            print(line, end="")
+        print(line, end="")
 
         lines.append(line.strip())
         if len(lines) == 11:

stages/openmvs.py

@@ -12,23 +12,6 @@ from opendm.osfm import OSFMContext
 from opendm.multispectral import get_primary_band_name
 from opendm.point_cloud import fast_merge_ply
 
-def check_built_with_cuda():
-    # Little hack to see if OpenMVS was built with CUDA..
-    cuda_build = False
-    try:
-        def on_output(line):
-            global cuda_build
-            if "--cuda-device arg" in line:
-                cuda_build = True
-
-        system.run('"%s" --help' % context.omvs_densify_path, on_output=on_output)
-        return cuda_build
-    except system.SubprocessException as e:
-        return cuda_build # OpenMVS returns 1 on --help
-    except Exception as e:
-        log.ODM_WARNING("Cannot detect if OpenMVS was built with CUDA (assuming no): %s" % str(e))
-        return False
-
 class ODMOpenMVSStage(types.ODM_Stage):
     def process(self, args, outputs):
         # get inputs
@@ -92,10 +75,8 @@ class ODMOpenMVSStage(types.ODM_Stage):
             ]
 
             gpu_config = []
-            omvs_cuda = check_built_with_cuda()
-            log.ODM_INFO("OpenMVS built with CUDA support: %s" % ("YES" if omvs_cuda else "NO"))
 
-            if (not has_gpu()) and omvs_cuda:
+            if not has_gpu():
                 gpu_config.append("--cuda-device -2")
 
             if args.pc_tile:
@@ -118,7 +99,7 @@ class ODMOpenMVSStage(types.ODM_Stage):
             except system.SubprocessException as e:
                 # If the GPU was enabled and the program failed,
                 # try to run it again without GPU
-                if e.errorCode == 1 and len(gpu_config) == 0 and omvs_cuda:
+                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 -2")
                     run_densify()