mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Added wo NUM_THREADS to gdalwarp merge 

Former-commit-id: 660ed68df1
pull/1161/head
Piero Toffanin 2019-05-06 15:03:09 -04:00
rodzic a08710ed7c
commit ff3435f4b3
1 zmienionych plików z 6 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
scripts/splitmerge.py
Wyświetl plik

@ -167,6 +167,9 @@ class ODMMergeStage(types.ODM_Stage):
all_point_clouds = get_submodel_paths(tree.submodels_path, "odm_georeferencing", "odm_georeferenced_model.laz") all_point_clouds = get_submodel_paths(tree.submodels_path, "odm_georeferencing", "odm_georeferenced_model.laz")
try: try:
# TODO: use entwine to create a tileset instead of
# merging, which is memory inefficient and creates
# monster files.
pdal.merge_point_clouds(all_point_clouds, tree.odm_georeferencing_model_laz, args.verbose) pdal.merge_point_clouds(all_point_clouds, tree.odm_georeferencing_model_laz, args.verbose)
except Exception as e: except Exception as e:
log.ODM_WARNING("Could not merge point cloud: %s (skipping)" % str(e)) log.ODM_WARNING("Could not merge point cloud: %s (skipping)" % str(e))
@ -208,7 +211,8 @@ class ODMMergeStage(types.ODM_Stage):
kwargs = { kwargs = {
'orthophoto_merged': merged_geotiff, 'orthophoto_merged': merged_geotiff,
'input_files': ' '.join(map(lambda i: quote(i[0]), all_orthos_and_cutlines)), 'input_files': ' '.join(map(lambda i: quote(i[0]), all_orthos_and_cutlines)),
'max_memory': get_max_memory() 'max_memory': get_max_memory(),
'threads': args.max_concurrency,
} }
# use bounds as cutlines (blending) # use bounds as cutlines (blending)
@ -231,6 +235,7 @@ class ODMMergeStage(types.ODM_Stage):
system.run('gdalwarp -cutline {cutline} ' system.run('gdalwarp -cutline {cutline} '
'-cblend 20 ' '-cblend 20 '
'-r lanczos -multi ' '-r lanczos -multi '
'-wo NUM_THREADS={threads} '
'--config GDAL_CACHEMAX {max_memory}% ' '--config GDAL_CACHEMAX {max_memory}% '
'{input_file} {orthophoto_merged}'.format(**kwargs) '{input_file} {orthophoto_merged}'.format(**kwargs)
) )