Skip to content

Commit

Permalink
Merge pull request #1754 from pierotofy/minviews
Browse files Browse the repository at this point in the history
Use min views filter = 1
  • Loading branch information
pierotofy authored Apr 12, 2024
2 parents ad63392 + aef4182 commit 6084d1d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.0
3.5.0
4 changes: 2 additions & 2 deletions opendm/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def config(argv=None, parser=None):
parser.add_argument('--feature-type',
metavar='<string>',
action=StoreValue,
default='sift',
default='dspsift',
choices=['akaze', 'dspsift', 'hahog', 'orb', 'sift'],
help=('Choose the algorithm for extracting keypoints and computing descriptors. '
'Can be one of: %(choices)s. Default: '
Expand Down Expand Up @@ -485,7 +485,7 @@ def config(argv=None, parser=None):
metavar='<positive float>',
action=StoreValue,
type=float,
default=2.5,
default=5,
help='Filters the point cloud by removing points that deviate more than N standard deviations from the local mean. Set to 0 to disable filtering. '
'Default: %(default)s')

Expand Down
8 changes: 4 additions & 4 deletions stages/openmvs.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def process(self, args, outputs):
extra_config.append("--ignore-mask-label 0")

with open(densify_ini_file, 'w+') as f:
f.write("Optimize = 7\n")
f.write("Optimize = 7\nMin Views Filter = 1\n")

def run_densify():
system.run('"%s" "%s" %s' % (context.omvs_densify_path,
Expand All @@ -110,7 +110,7 @@ def run_densify():
log.ODM_WARNING("OpenMVS failed with GPU, is your graphics card driver up to date? Falling back to CPU.")
gpu_config = ["--cuda-device -2"]
run_densify()
elif (e.errorCode == 137 or e.errorCode == 3221226505) and not pc_tile:
elif (e.errorCode == 137 or e.errorCode == 143 or e.errorCode == 3221226505) and not pc_tile:
log.ODM_WARNING("OpenMVS ran out of memory, we're going to turn on tiling to see if we can process this.")
pc_tile = True
config.append("--fusion-mode 1")
Expand All @@ -127,7 +127,7 @@ def run_densify():

subscene_densify_ini_file = os.path.join(tree.openmvs, 'subscene-config.ini')
with open(subscene_densify_ini_file, 'w+') as f:
f.write("Optimize = 0\nEstimation Geometric Iters = 0\n")
f.write("Optimize = 0\nEstimation Geometric Iters = 0\nMin Views Filter = 1\n")

config = [
"--sub-scene-area 660000", # 8000
Expand Down Expand Up @@ -223,7 +223,7 @@ def skip_filtering():
try:
system.run('"%s" %s' % (context.omvs_densify_path, ' '.join(config + gpu_config + extra_config)))
except system.SubprocessException as e:
if e.errorCode == 137 or e.errorCode == 3221226505:
if e.errorCode == 137 or e.errorCode == 143 or e.errorCode == 3221226505:
log.ODM_WARNING("OpenMVS filtering ran out of memory, visibility checks will be skipped.")
skip_filtering()
else:
Expand Down

0 comments on commit 6084d1d

Please sign in to comment.