tink/nerfstudio
4
0
Fork 0
mirror of https://github.com/nerfstudio-project/nerfstudio.git synced 2026-11-10 18:17:31 +08:00
Code

Merge 9a0ade8c0d into 50e0e3c70c

Browse Source
This commit is contained in:
bjoernellens1 2026-08-11 11:07:14 +02:00 committed by GitHub
commit bb7eb4c2d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nerfstudio/process_data/colmap_utils.py
View File

@ -115,6 +115,12 @@ def run_colmap(
"""
colmap_version = get_colmap_version(colmap_cmd)
# COLMAP's #3465 (released in 3.13.0) renamed the use_gpu/gpu_index options from
# SiftExtraction/SiftMatching to FeatureExtraction/FeatureMatching as part of
# generalizing feature extraction beyond SIFT; the old names were dropped, not kept
# as aliases, so this must be version-gated rather than always using one or the other.
use_gpu_extraction_prefix = "FeatureExtraction" if colmap_version >= Version("3.13") else "SiftExtraction"
use_gpu_matching_prefix = "FeatureMatching" if colmap_version >= Version("3.13") else "SiftMatching"
colmap_database_path = colmap_dir / "database.db"
colmap_database_path.unlink(missing_ok=True)
@ -126,7 +132,7 @@ def run_colmap(
f"--image_path {image_dir}",
"--ImageReader.single_camera 1",
f"--ImageReader.camera_model {camera_model.value}",
f"--SiftExtraction.use_gpu {int(gpu)}",
f"--{use_gpu_extraction_prefix}.use_gpu {int(gpu)}",
]
if camera_mask_path is not None:
feature_extractor_cmd.append(f"--ImageReader.camera_mask_path {camera_mask_path}")
@ -140,7 +146,7 @@ def run_colmap(
feature_matcher_cmd = [
f"{colmap_cmd} {matching_method}_matcher",
f"--database_path {colmap_dir / 'database.db'}",
f"--SiftMatching.use_gpu {int(gpu)}",
f"--{use_gpu_matching_prefix}.use_gpu {int(gpu)}",
]
if matching_method == "vocab_tree":
vocab_tree_filename = get_vocab_tree()