kopia lustrzana https://github.com/OpenDroneMap/ODM
Entwine --> Untwine
rodzic
140203b8cf
commit
a2040b2274
|
@ -19,7 +19,7 @@ RUN rm -rf \
|
||||||
/code/SuperBuild/build/opencv \
|
/code/SuperBuild/build/opencv \
|
||||||
/code/SuperBuild/download \
|
/code/SuperBuild/download \
|
||||||
/code/SuperBuild/src/ceres \
|
/code/SuperBuild/src/ceres \
|
||||||
/code/SuperBuild/src/entwine \
|
/code/SuperBuild/src/untwine \
|
||||||
/code/SuperBuild/src/gflags \
|
/code/SuperBuild/src/gflags \
|
||||||
/code/SuperBuild/src/hexer \
|
/code/SuperBuild/src/hexer \
|
||||||
/code/SuperBuild/src/lastools \
|
/code/SuperBuild/src/lastools \
|
||||||
|
|
|
@ -108,7 +108,7 @@ set(custom_libs OpenSfM
|
||||||
LASzip
|
LASzip
|
||||||
Zstd
|
Zstd
|
||||||
PDAL
|
PDAL
|
||||||
Entwine
|
Untwine
|
||||||
MvsTexturing
|
MvsTexturing
|
||||||
OpenMVS
|
OpenMVS
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
set(_proj_name entwine)
|
set(_proj_name untwine)
|
||||||
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
|
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
|
||||||
|
|
||||||
ExternalProject_Add(${_proj_name}
|
ExternalProject_Add(${_proj_name}
|
||||||
|
@ -8,16 +8,14 @@ ExternalProject_Add(${_proj_name}
|
||||||
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
||||||
#--Download step--------------
|
#--Download step--------------
|
||||||
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
||||||
GIT_REPOSITORY https://github.com/connormanning/entwine/
|
GIT_REPOSITORY https://github.com/pierotofy/untwine/
|
||||||
GIT_TAG 2.1.0
|
GIT_TAG insttgt
|
||||||
#--Update/Patch step----------
|
#--Update/Patch step----------
|
||||||
UPDATE_COMMAND ""
|
UPDATE_COMMAND ""
|
||||||
#--Configure step-------------
|
#--Configure step-------------
|
||||||
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
|
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_CXX_FLAGS=-isystem\ ${SB_SOURCE_DIR}/pdal
|
-DPDAL_DIR=${SB_INSTALL_DIR}/lib/cmake/PDAL
|
||||||
-DADDITIONAL_LINK_DIRECTORIES_PATHS=${SB_INSTALL_DIR}/lib
|
|
||||||
-DWITH_TESTS=OFF
|
|
||||||
-DCMAKE_BUILD_TYPE=Release
|
-DCMAKE_BUILD_TYPE=Release
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||||
#--Build step-----------------
|
#--Build step-----------------
|
|
@ -19,24 +19,15 @@ def build(input_point_cloud_files, output_path, max_concurrency=8, rerun=False):
|
||||||
shutil.rmtree(output_path)
|
shutil.rmtree(output_path)
|
||||||
|
|
||||||
kwargs = {
|
kwargs = {
|
||||||
'threads': max_concurrency,
|
# 'threads': max_concurrency,
|
||||||
'tmpdir': tmpdir,
|
'tmpdir': tmpdir,
|
||||||
'all_inputs': "-i " + " ".join(map(quote, input_point_cloud_files)),
|
'files': "--files " + " ".join(map(quote, input_point_cloud_files)),
|
||||||
'outputdir': output_path
|
'outputdir': output_path
|
||||||
}
|
}
|
||||||
|
|
||||||
# Run scan to compute dataset bounds
|
# Run untwine
|
||||||
system.run('entwine scan --threads {threads} --tmp "{tmpdir}" {all_inputs} -o "{outputdir}"'.format(**kwargs))
|
system.run('untwine --temp_dir "{tmpdir}" {files} --output_dir "{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(num_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)
|
|
||||||
|
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
if os.path.exists(tmpdir):
|
if os.path.exists(tmpdir):
|
||||||
shutil.rmtree(tmpdir)
|
shutil.rmtree(tmpdir)
|
|
@ -19,7 +19,7 @@ RUN rm -rf \
|
||||||
/code/SuperBuild/build/opencv \
|
/code/SuperBuild/build/opencv \
|
||||||
/code/SuperBuild/download \
|
/code/SuperBuild/download \
|
||||||
/code/SuperBuild/src/ceres \
|
/code/SuperBuild/src/ceres \
|
||||||
/code/SuperBuild/src/entwine \
|
/code/SuperBuild/src/untwine \
|
||||||
/code/SuperBuild/src/gflags \
|
/code/SuperBuild/src/gflags \
|
||||||
/code/SuperBuild/src/hexer \
|
/code/SuperBuild/src/hexer \
|
||||||
/code/SuperBuild/src/lastools \
|
/code/SuperBuild/src/lastools \
|
||||||
|
|
|
@ -196,7 +196,7 @@ parts:
|
||||||
- -odm/SuperBuild/build/openmvs
|
- -odm/SuperBuild/build/openmvs
|
||||||
- -odm/SuperBuild/download
|
- -odm/SuperBuild/download
|
||||||
- -odm/SuperBuild/src/ceres
|
- -odm/SuperBuild/src/ceres
|
||||||
- -odm/SuperBuild/src/entwine
|
- -odm/SuperBuild/src/untwine
|
||||||
- -odm/SuperBuild/src/gflags
|
- -odm/SuperBuild/src/gflags
|
||||||
- -odm/SuperBuild/src/hexer
|
- -odm/SuperBuild/src/hexer
|
||||||
- -odm/SuperBuild/src/lastools
|
- -odm/SuperBuild/src/lastools
|
||||||
|
|
Ładowanie…
Reference in New Issue