Merge pull request #1217 from pierotofy/231

Entwine/untwine, life's better together

Dockerfile

@@ -20,6 +20,7 @@ RUN rm -rf \
   /code/SuperBuild/download \
   /code/SuperBuild/src/ceres \
   /code/SuperBuild/src/untwine \
+  /code/SuperBuild/src/entwine \
   /code/SuperBuild/src/gflags \
   /code/SuperBuild/src/hexer \
   /code/SuperBuild/src/lastools \

SuperBuild/CMakeLists.txt

@@ -109,6 +109,7 @@ set(custom_libs OpenSfM
                 Zstd
 				PDAL
                 Untwine
+                Entwine
 				MvsTexturing
                 OpenMVS
 )

SuperBuild/cmake/External-Entwine.cmake

@@ -0,0 +1,31 @@
+set(_proj_name entwine)
+set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
+
+ExternalProject_Add(${_proj_name}
+  DEPENDS           pdal
+  PREFIX            ${_SB_BINARY_DIR}
+  TMP_DIR           ${_SB_BINARY_DIR}/tmp
+  STAMP_DIR         ${_SB_BINARY_DIR}/stamp
+  #--Download step--------------
+  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
+  GIT_REPOSITORY    https://github.com/connormanning/entwine/
+  GIT_TAG           2.1.0
+  #--Update/Patch step----------
+  UPDATE_COMMAND    ""
+  #--Configure step-------------
+  SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
+  CMAKE_ARGS
+    -DCMAKE_CXX_FLAGS=-isystem\ ${SB_SOURCE_DIR}/pdal
+    -DADDITIONAL_LINK_DIRECTORIES_PATHS=${SB_INSTALL_DIR}/lib
+    -DWITH_TESTS=OFF
+	-DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
+  #--Build step-----------------
+  BINARY_DIR        ${_SB_BINARY_DIR}
+  #--Install step---------------
+  INSTALL_DIR       ${SB_INSTALL_DIR}
+  #--Output logging-------------
+  LOG_DOWNLOAD      OFF
+  LOG_CONFIGURE     OFF
+  LOG_BUILD         OFF
+)

VERSION

@@ -1 +1 @@
-2.3.1
+2.3.2

opendm/entwine.py

@@ -6,6 +6,7 @@ from opendm import log
 from opendm import system
 from opendm import concurrency
 
+
 def build(input_point_cloud_files, output_path, max_concurrency=8, rerun=False):
     num_files = len(input_point_cloud_files)
     if num_files == 0:
@@ -14,10 +15,52 @@ def build(input_point_cloud_files, output_path, max_concurrency=8, rerun=False):
 
     tmpdir = io.related_file_path(output_path, postfix="-tmp")
 
-    if rerun and io.dir_exists(output_path):
-        log.ODM_WARNING("Removing previous EPT directory: %s" % output_path)
-        shutil.rmtree(output_path)
+    def dir_cleanup():
+        if io.dir_exists(output_path):
+            log.ODM_WARNING("Removing previous EPT directory: %s" % output_path)
+            shutil.rmtree(output_path)
+    
+        if io.dir_exists(tmpdir):
+            log.ODM_WARNING("Removing previous EPT temp directory: %s" % tmpdir)
+            shutil.rmtree(tmpdir)
+    
+    if rerun:
+        dir_cleanup()
 
+    # Attempt with entwine (faster, more memory hungry)
+    try:
+        build_entwine(input_point_cloud_files, tmpdir, output_path, max_concurrency=max_concurrency)
+    except Exception as e:
+        log.ODM_WARNING("Cannot build EPT using entwine (%s), attempting with untwine..." % str(e))
+        dir_cleanup()
+        build_untwine(input_point_cloud_files, tmpdir, output_path, max_concurrency=max_concurrency)
+        
+    if os.path.exists(tmpdir):
+        shutil.rmtree(tmpdir)
+
+
+def build_entwine(input_point_cloud_files, tmpdir, output_path, max_concurrency=8):
+    kwargs = {
+        'threads': max_concurrency,
+        'tmpdir': tmpdir,
+        'all_inputs': "-i " + " ".join(map(quote, input_point_cloud_files)),
+        'outputdir': output_path
+    }
+
+    # Run scan to compute dataset bounds
+    system.run('entwine scan --threads {threads} --tmp "{tmpdir}" {all_inputs} -o "{outputdir}"'.format(**kwargs))
+    scan_json = os.path.join(output_path, "scan.json")
+
+    if os.path.exists(scan_json):
+        kwargs['input'] = scan_json
+        for _ in range(len(input_point_cloud_files)):
+            # One at a time
+            system.run('entwine build --threads {threads} --tmp "{tmpdir}" -i "{input}" -o "{outputdir}" --run 1'.format(**kwargs))
+    else:
+        log.ODM_WARNING("%s does not exist, no point cloud will be built." % scan_json)
+        
+
+def build_untwine(input_point_cloud_files, tmpdir, output_path, max_concurrency=8, rerun=False):
     kwargs = {
         # 'threads': max_concurrency,
         'tmpdir': tmpdir,
@@ -27,7 +70,3 @@ def build(input_point_cloud_files, output_path, max_concurrency=8, rerun=False):
 
     # Run untwine
     system.run('untwine --temp_dir "{tmpdir}" {files} --output_dir "{outputdir}"'.format(**kwargs))
-
-    # Cleanup    
-    if os.path.exists(tmpdir):
-        shutil.rmtree(tmpdir)

portable.Dockerfile

@@ -20,6 +20,7 @@ RUN rm -rf \
   /code/SuperBuild/download \
   /code/SuperBuild/src/ceres \
   /code/SuperBuild/src/untwine \
+  /code/SuperBuild/src/entwine \  
   /code/SuperBuild/src/gflags \
   /code/SuperBuild/src/hexer \
   /code/SuperBuild/src/lastools \

snap/snapcraft.yaml

@@ -203,6 +203,7 @@ parts:
       - -odm/SuperBuild/download
       - -odm/SuperBuild/src/ceres
       - -odm/SuperBuild/src/untwine
+      - -odm/SuperBuild/src/entwine
       - -odm/SuperBuild/src/gflags
       - -odm/SuperBuild/src/hexer
       - -odm/SuperBuild/src/lastools