Skip to content
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.

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

Egu #58

Merged
merged 66 commits into from
Apr 13, 2024
Merged

Egu #58

Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
8b12f70
fixed bug with MatcherBase with no tile preselection active
franioli Mar 25, 2024
63e847d
updated reccomended roma config
franioli Mar 25, 2024
a179da6
updated config.py
franioli Mar 25, 2024
9c12be1
updated roma to last version
franioli Mar 26, 2024
89e75f4
testing new tile preselection based on roma
franioli Mar 26, 2024
662fe92
remove unused reconstruction.main function
franioli Mar 28, 2024
6cb3533
updated for roma and lightglue
franioli Mar 28, 2024
aea581d
added geom verification test
franioli Mar 28, 2024
133fabf
replaced _config with config in all classes
franioli Mar 28, 2024
04799fb
updated config managment in base matcher classes
franioli Mar 28, 2024
0d01b62
updated default parameters in roma and exposed to yaml config
franioli Mar 28, 2024
ad32941
cleaned reconstruction.py
franioli Mar 28, 2024
143e28c
updated reconstruction.py
franioli Mar 28, 2024
dd9a87c
cleaned up reconstruction
franioli Mar 28, 2024
31d7d16
removed triangulation from DIM
franioli Mar 28, 2024
1b51e6e
updated roma
franioli Mar 28, 2024
c676a44
updated database
franioli Mar 29, 2024
ffcf92c
cleaning dependancies
franioli Mar 29, 2024
10bed40
updated import in __init__
franioli Mar 29, 2024
be29080
update pyproject.toml
franioli Mar 29, 2024
b20a990
removed pandas dependency
franioli Mar 29, 2024
2e277b7
restructured all imports to be all inside the package
franioli Mar 29, 2024
5dffba2
updated ImageMatcher, ExtractorBase and MatcherBase, classes. Some te…
franioli Mar 29, 2024
618366f
fixed bug in aliked
franioli Mar 29, 2024
8e996f1
updated _default_config in all extractors and matchers
franioli Mar 29, 2024
0f5f65d
added context manager to COLMAPDatabase
franioli Mar 30, 2024
396ccaf
added new triangulation module
franioli Mar 30, 2024
f5b68ed
added utils.py
franioli Mar 30, 2024
63b4310
updated constants and imports
franioli Mar 30, 2024
fc1123a
added notebook for dense triangulation with known camera poses
franioli Mar 30, 2024
1567ddc
updated triangulation notebook
franioli Mar 30, 2024
7433e77
updated triangulation module
franioli Mar 30, 2024
6cea00d
updated imports to avoid crashes with no pycolmap
franioli Mar 30, 2024
265cbc8
updated github actions for installing pytest
franioli Mar 30, 2024
597a942
moved graph template dir to utils
franioli Mar 30, 2024
7d8af52
moved hloc to thirdparty
franioli Mar 30, 2024
d8e2e78
updated scripts
franioli Apr 8, 2024
d9e6fd4
bump version 1.0.0 -> 1.1.0
franioli Apr 8, 2024
55511a1
updated pyproject.toml
franioli Apr 8, 2024
de8da33
bump version 1.1.0 -> 1.1.1
franioli Apr 8, 2024
54b297a
updated readme
franioli Apr 9, 2024
d15d2e4
belv notebook
franioli Apr 9, 2024
e60142d
updated __init__
franioli Apr 9, 2024
f4473c8
Merge branch 'imports' into egu
franioli Apr 9, 2024
00bb947
imporved roma lowres preselection
franioli Apr 10, 2024
9e9211e
various small updates
franioli Apr 10, 2024
eb25063
Merge branch 'dev' of github.com:3DOM-FBK/deep-image-matching into dev
franioli Apr 10, 2024
468d677
Merge branch 'dev' into egu
franioli Apr 10, 2024
cae0c07
fixed geoemtric verification with NONE parameter
franioli Apr 10, 2024
bb94131
updated triangulation from known poses
franioli Apr 10, 2024
3adec4e
added notebooks
franioli Apr 10, 2024
c227edd
added option to select lightglue or roma preselection
franioli Apr 11, 2024
c603719
updated notebook
franioli Apr 11, 2024
4c78a5f
small updates in roma
franioli Apr 11, 2024
4d6f50d
updated notebooks
franioli Apr 11, 2024
9c44ce4
updates export_to_colmap to read cameras.yaml
franioli Apr 12, 2024
b8970ea
updated notebooks
franioli Apr 13, 2024
3ef8dae
updated export to openmvg and export to db to read camera option file
franioli Apr 13, 2024
0718db0
updated all tests and fixed bug in config reader
franioli Apr 13, 2024
c2c260e
fixed tests
franioli Apr 13, 2024
d62db1c
removed xformers from depandancy due to installation problem on macos
franioli Apr 13, 2024
afb91df
bump version 1.1.1 -> 1.2.0
franioli Apr 13, 2024
ea1c37b
added action to publish on pypi
franioli Apr 13, 2024
d43e50b
updated action to publish to pypi
franioli Apr 13, 2024
e6a98f4
bump version 1.2.0 -> 1.2.1
franioli Apr 13, 2024
d6d0e71
triangulation and reconstruction module imported only if pycolmap is …
franioli Apr 13, 2024
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
Prev Previous commit
Next Next commit
small updates in roma
  • Loading branch information
franioli committed Apr 11, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
edmorley Ed Morley
commit 4c78a5f351cc213bae5a9bbf602eec78be3ad6b0
24 changes: 24 additions & 0 deletions assets/example_cyprus/config_superpoint+lightglue.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# User configuration file

general:
tile_size: (2400, 2000)
geom_verification: PYDEGENSAC # NONE, PYDEGENSAC, MAGSAC, RANSAC, LMEDS, RHO, USAC_DEFAULT, USAC_PARALLEL, USAC_FM_8PTS, USAC_FAST, USAC_ACCURATE, USAC_PROSAC, USAC_MAGSAC
gv_threshold: 4
min_inliers_per_pair: 10
min_inlier_ratio_per_pair: 0.25

extractor:
name: "superpoint"
max_keypoints: 8000 # -1 no limits
nms_radius: 4
keypoint_threshold: 0.005
remove_borders: 4
fix_sampling: False

matcher:
name: "lightglue"
flash: True # enable FlashAttention if available
mp: False # enable mixed precision
depth_confidence: 0.95 # early stopping, disable with -1
width_confidence: 0.99 # point pruning, disable with -1
filter_threshold: 0.10 # match threshold
6 changes: 4 additions & 2 deletions src/deep_image_matching/matchers/matcher_base.py
Original file line number Diff line number Diff line change
@@ -1025,8 +1025,10 @@ def tile_selection(
# match downsampled images with roma
from ..thirdparty.RoMa.roma import roma_outdoor

n_matches = 2000
matcher = roma_outdoor(device, coarse_res=280, upsample_res=420)
n_matches = 5000
coarse_res = 420
upsample_res = 560
matcher = roma_outdoor(device, coarse_res=coarse_res, upsample_res=upsample_res)
H_A, W_A = i0_new_size
H_B, W_B = i1_new_size
warp, certainty = matcher.match(str(img0), str(img1), device=device)
5 changes: 2 additions & 3 deletions src/deep_image_matching/matchers/roma.py
Original file line number Diff line number Diff line change
@@ -42,10 +42,9 @@ class RomaMatcher(DetectorFreeMatcherBase):

grayscale = False
as_float = True
max_tile_pairs = 150 # Maximum number of tile pairs to match, raise an error if more than this number to avoid slow and likely inaccurate matching
# max_matches_per_pair = 10000
max_tile_pairs = 250 # Maximum number of tile pairs to match, raise an error if more than this number to avoid slow and likely inaccurate matching
min_matches_per_tile = 3
max_matches_per_tile = 5000
max_matches_per_tile = 10000
keep_tiles = True # False

def __init__(self, config={}) -> None:
Loading