FeatureMatching: Prefix output matches files when using "ranges" to avoid overwrites #628
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When using range parameters from main_featureMatching, prefix the resulting files with rangeStart/rangeSize (i.e: iteration index when processing all views by chunks). => with matchFilePerImage: avoids overwriting files if a view is present in several iterations => without matchFilePerImage: avoids overwriting the unique resulting file * io: consider all files containing "matches.txt" when loading matches files from a folder
`matchFilePerImage` was activated by default to handle parallel runs of `featureMatching` on different ranges of views of the same scene. This is now handled by the prefix added to output files when using range related parameters.
yann-lty
force-pushed
the
dev_matchingIO
branch
from
e761d1a to
e830096
Compare
* matches are accumulated when successively loading several files using the same PairwiseMatches variable without clearing it * check for duplicates and test deduplication function
Ensure a folder is not considered twice when loading features and matches.
yann-lty
force-pushed
the
dev_matchingIO
branch
from
e6eace0 to
8e012c6
Compare
simogasp
approved these changes
Apr 29, 2019
yann-lty
force-pushed
the
dev_matchingIO
branch
from
54e3f76 to
abc661c
Compare
* handle conversions to relative and absolute paths when _absolutePath is defined * update internal relative folder paths when absolutePath is modified * ensure features/matches folders contains no duplicates * [tests] add 'sfmData_test' module + test internal folders management * [software] update global/incrementalSfm
|
We should update the major version of |
…vention has changed This new version is able to load files with the previous naming convention but not the opposite.
fabiencastan
reviewed
Jun 6, 2019
| BOOST_CHECK(fs::path(featuresFolders[0]).is_absolute()); | ||
| BOOST_CHECK(fs::equivalent(featuresFolders[0], refFolder)); | ||
| BOOST_CHECK(fs::path(matchesFolders[0]).is_absolute()); | ||
| BOOST_CHECK(fs::equivalent(matchesFolders[0], refFolder)); |
There was a problem hiding this comment.
We could try to add a new folder, like:
sfmData.setAbsolutePath(fs::absolute(filename).string());
sfmData.addFeaturesFolder(fs::absolute(filename) / "uselessFolder/..").string()); // duplicates from non-canonical path
to check the canonical path conversion with duplicates from different input strings.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Introduce an automatic prefix system for matches files when using "range" command-line parameters. The goal of this PR is to ensure a file created for one iteration does not get overwritten in another one.
When generating matches files per image, we rely on minimal viewId of each image pair to create the filename (minViewId.txt). By iterating over sorted viewIds which only match with greater viewIds, this guarantees that files are written only once.
However, the latter condition can be broken in the current pipeline when the file generated by the ImageMatching step declares for one view [B] a match with a view [A] that has an inferior viewId. This occurs when [A] has reached max view matches; the [A,B] view match is moved to [B]. If [A] and [B] are handled in two distinct iterations (1) and (2), "A.txt" will be first written in (1) and overwritten in (2). All matches from (1) are then lost.
By automatically prefixing matches files based on "range" parameters and generating only one matches file per execution by default, this guarantees uniqueness of generated files.
This also changes the loading of matches files, which will now consider all "*matches.txt" files in the given folder. This behavior is retro-compatible with previously generated files.
Features list
Implementation remarks
Prefix is created by dividing rangeStart/rangeSize which reflects the iteration number when working by chunks. This is preferred to random naming for debug purposes.