Skip to content

ImageMatching: Only require featuresFolders when it is relevant to the matching method #2197

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
cbentejac merged 1 commit into from
Oct 9, 2026
Merged

ImageMatching: Only require featuresFolders when it is relevant to the matching method #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion meshroom/aliceVision/ImageMatching.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.0"
__version__ = "2.1"

from meshroom.core import desc
from meshroom.core.utils import VERBOSE_LEVEL
Expand Down Expand Up @@ -51,6 +51,7 @@ class ImageMatching(desc.AVCommandLineNode):
label="Features Folders",
description="Folder(s) containing the extracted features and descriptors.",
exposed=True,
enabled=lambda node: node.method.value not in ("Exhaustive", "Sequential"),
),
desc.ChoiceParam(
name="method",
Expand Down
3 changes: 2 additions & 1 deletion meshroom/aliceVision/ImageMatchingMultiSfM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.1"
__version__ = "2.1"

from meshroom.core import desc
from meshroom.core.utils import VERBOSE_LEVEL
Expand Down Expand Up @@ -43,6 +43,7 @@ class ImageMatchingMultiSfM(desc.AVCommandLineNode):
label="Features Folders",
description="Folder(s) containing the extracted features and descriptors.",
exposed=True,
enabled=lambda node: node.method.value not in ("Exhaustive", "Sequential"),
),
desc.ChoiceParam(
name="method",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/cameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"ExportImages": "1.1",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationSam3": "2.0",
"IntrinsicsTransforming": "1.1",
"KeyframeSelection": "5.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/cameraTrackingDepth.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"ExportImages": "1.1",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationSam3": "2.0",
"IntrinsicsTransforming": "1.1",
"KeyframeSelection": "5.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/cameraTrackingLegacy.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "1.0",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationBox": "1.0",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/cameraTrackingLidarExperimental.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"ExportImages": "1.1",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationSam3": "2.0",
"InputFile": "1.0",
"IntrinsicsTransforming": "1.1",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/cameraTrackingWithoutCalibration.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"ExportImages": "1.1",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationSam3": "2.0",
"IntrinsicsTransforming": "1.1",
"KeyframeSelection": "5.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/cameraTrackingWithoutCalibrationLegacy.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "1.0",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationBox": "1.0",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/multi-viewPhotometricStereo.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"DepthMapFilter": "4.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"LightingCalibration": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodalCameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ExportImages": "1.1",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"ImageSegmentationSam3": "2.0",
"IntrinsicsTransforming": "1.1",
"NodalSfM": "2.1",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodalCameraTrackingWithoutCalibration.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ExportImages": "1.1",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"ImageSegmentationSam3": "2.0",
"IntrinsicsTransforming": "1.1",
"NodalSfM": "2.1",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/panoramaFisheyeHdr.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"CopyFiles": "1.3",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"LdrToHdrCalibration": "3.2",
"LdrToHdrMerge": "4.2",
"LdrToHdrSampling": "4.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/panoramaHdr.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"CopyFiles": "1.3",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"LdrToHdrCalibration": "3.2",
"LdrToHdrMerge": "4.2",
"LdrToHdrSampling": "4.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/photogrammetry.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"ExportImages": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"IntrinsicsTransforming": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/photogrammetryAndCameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"ExportImages": "1.1",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationSam3": "2.0",
"IntrinsicsTransforming": "1.1",
"KeyframeSelection": "5.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/photogrammetryAndCameraTrackingLegacy.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "1.0",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationBox": "1.0",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/photogrammetryDraft.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"CopyFiles": "1.3",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"MeshFiltering": "3.0",
"Meshing": "7.0",
"PrepareDenseScene": "3.1",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/photogrammetryLegacy.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"DepthMapFilter": "4.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"MeshFiltering": "3.0",
"Meshing": "7.0",
"PrepareDenseScene": "3.1",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/photogrammetryObject.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "1.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"ImageSegmentationBox": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/photogrammetryObjectTurntable.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "1.0",
"ImageMatching": "2.0",
"ImageMatching": "2.1",
"ImageSegmentationBox": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/photogrammetryObjectTwoSides.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "1.0",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.1",
"ImageMatching": "2.1",
"ImageMatchingMultiSfM": "2.1",
"ImageSegmentationBox": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
Expand Down
12 changes: 9 additions & 3 deletions src/software/pipeline/main_imageMatching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

// These constants define the current software version.
// They must be updated when the command line is changed.
#define ALICEVISION_SOFTWARE_VERSION_MAJOR 1
#define ALICEVISION_SOFTWARE_VERSION_MAJOR 2
#define ALICEVISION_SOFTWARE_VERSION_MINOR 1

using namespace aliceVision;
Expand Down Expand Up @@ -83,13 +83,13 @@ int aliceVision_main(int argc, char** argv)
requiredParams.add_options()
("input,i", po::value<std::string>(&sfmDataFilenameA)->required(),
"SfMData file.")
("featuresFolders,f", po::value<std::vector<std::string>>(&featuresFolders)->multitoken()->required(),
"Path to folder(s) containing the extracted features.")
("output,o", po::value<std::string>(&outputFile)->required(),
"Filepath to the output file with the list of selected image pairs.");

po::options_description optionalParams("Optional parameters");
optionalParams.add_options()
("featuresFolders,f", po::value<std::vector<std::string>>(&featuresFolders)->multitoken(),
"Path to folder(s) containing the extracted features (not used by the Exhaustive and Sequential methods).")
("method", po::value<EImageMatchingMethod>(&method)->default_value(method),
"Method used to select the image pairs to match:\n"
" * VocabularyTree: select images that appear to share content\n"
Expand Down Expand Up @@ -186,6 +186,12 @@ int aliceVision_main(int argc, char** argv)

if (method != EImageMatchingMethod::EXHAUSTIVE && method != EImageMatchingMethod::SEQUENTIAL)
{
if (featuresFolders.empty())
{
ALICEVISION_LOG_ERROR("The selected image matching method requires features folders.");
return EXIT_FAILURE;
}

// load descriptor filenames
aliceVision::voctree::getListOfDescriptorFiles(sfmDataA, featuresFolders, descriptorsFilesA);

Expand Down
Loading