8000 Set number of features for different quality levels by ahojnnes · Pull Request #1975 · colmap/colmap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Set number of features for different quality levels #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 24, 2023
Merged

Set number of features for different quality levels #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb14608
Set number of features for different quality levels
ahojnnes Jun 24, 2023
cdbefa9
f
ahojnnes Jun 24, 2023
3901caa
d
ahojnnes Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/build-mac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
variables:
CCACHE_DIR: $(Pipeline.Workspace)/ccache
CCACHE_BASEDIR: $(Build.SourcesDirectory)
CCACHE_VERSION: 1
steps:
- script: |
brew install \
Expand All @@ -33,7 +34,6 @@ jobs:
- task: Cache@2
inputs:
key: ccache | "$(CCACHE_VERSION)" | "$(Agent.OS)" | "${{ parameters.displayName }}"
restoreKeys: ccache | "$(CCACHE_VERSION)" | "$(Agent.OS)" | "${{ parameters.displayName }}"
path: $(CCACHE_DIR)
displayName: Restore ccache

Expand Down
1 change: 0 additions & 1 deletion .azure-pipelines/build-ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ jobs:
- task: Cache@2
inputs:
key: ccache | "$(CCACHE_VERSION)" | "$(Agent.OS)" | "${{ parameters.displayName }}"
restoreKeys: ccache | "$(CCACHE_VERSION)" | "$(Agent.OS)" | "${{ parameters.displayName }}"
path: $(CCACHE_DIR)
displayName: Restore ccache

Expand Down
8 changes: 4 additions & 4 deletions .azure-pipelines/build-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
VCPKG_BINARY_SOURCES: 'clear;nuget,https://pkgs.dev.azure.com/colmap/colmap/_packaging/vcpkg/nuget/v3/index.json,readwrite'
CCACHE_DIR: $(Pipeline.Workspace)/ccache
CCACHE_BASEDIR: $(Build.SourcesDirectory)
CCACHE_VERSION: 1
steps:
- task: NuGetAuthenticate@0
displayName: NuGet Authenticate
Expand All @@ -36,7 +37,6 @@ jobs:
- task: Cache@2
inputs:
key: ccache | "$(CCACHE_VERSION)" | "$(Agent.OS)" | "${{ parameters.displayName }}"
restoreKeys: ccache | "$(CCACHE_VERSION)" | "$(Agent.OS)" | "${{ parameters.displayName }}"
path: $(CCACHE_DIR)
cacheHitVar: CCACHE_RESTORED
displayName: Restore ccache
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
displayName: Run tests

- pwsh: |
ccache --show-stats
ccache --evict-older-than 1d
ccache --show-stats
$(CCACHE_DIR)/bin/ccache --show-stats
$(CCACHE_DIR)/bin/ccache --evict-older-than 1d
$(CCACHE_DIR)/bin/ccache --show-stats
displayName: Cleanup ccache
3 changes: 3 additions & 0 deletions src/colmap/util/option_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ void OptionManager::ModifyForInternetData() {

void OptionManager::ModifyForLowQuality() {
sift_extraction->max_image_size = 1000;
sift_extraction->max_num_features = 2048;
sequential_matching->loop_detection_num_images /= 2;
vocab_tree_matching->num_images /= 2;
mapper->ba_local_max_num_iterations /= 2;
Expand All @@ -129,6 +130,7 @@ void OptionManager::ModifyForLowQuality() {

void OptionManager::ModifyForMediumQuality() {
sift_extraction->max_image_size = 1600;
sift_extraction->max_num_features = 4096;
sequential_matching->loop_detection_num_images /= 1.5;
vocab_tree_matching->num_images /= 1.5;
mapper->ba_local_max_num_iterations /= 1.5;
Expand All @@ -149,6 +151,7 @@ void OptionManager::ModifyForMediumQuality() {
void OptionManager::ModifyForHighQuality() {
sift_extraction->estimate_affine_shape = true;
sift_extraction->max_image_size = 2400;
sift_extraction->max_num_features = 8192;
sift_matching->guided_matching = true;
mapper->ba_local_max_num_iterations = 30;
mapper->ba_local_max_refinements = 3;
Expand Down
0