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

Removed -wm flag from gdalwarp 

Former-commit-id: 947a287ad2
pull/1161/head
Piero Toffanin 2019-05-02 09:27:47 -04:00
rodzic eee93d4337
commit 6c1b664583
1 zmienionych plików z 2 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
scripts/splitmerge.py
Wyświetl plik

@ -11,7 +11,7 @@ from opendm.dem import pdal, utils
from opendm.dem.merge import euclidean_merge_dems from opendm.dem.merge import euclidean_merge_dems
from opensfm.large import metadataset from opensfm.large import metadataset
from opendm.cropper import Cropper from opendm.cropper import Cropper
from opendm.concurrency import get_max_memory, get_max_memory_mb from opendm.concurrency import get_max_memory
from pipes import quote from pipes import quote
class ODMSplitStage(types.ODM_Stage): class ODMSplitStage(types.ODM_Stage):
@ -196,8 +196,7 @@ 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()
'max_memory_mb': get_max_memory_mb(300)
} }
# use bounds as cutlines (blending) # use bounds as cutlines (blending)
@ -220,7 +219,6 @@ 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 '
'-wm {max_memory_mb} '
'--config GDAL_CACHEMAX {max_memory}% ' '--config GDAL_CACHEMAX {max_memory}% '
'{input_file} {orthophoto_merged}'.format(**kwargs) '{input_file} {orthophoto_merged}'.format(**kwargs)
) )