Skip to content

Commit 8481f89

Browse files
Merge matching-result retention into simpler branch (maintenance)
Summary - Integrate reviewed fork main 6fbb2de and retain the one-file PatchMatch alternative unchanged (+1/-25 relative to main). Validation - Exact source-integration review; incoming three blobs match main. - Matching-retention qualification belongs to its independent native receipt: 25 passing tests, three expected original-source controls and configured tidy. - No combined-tree rebuild, runtime, performance or quality claim. Developed with assistance from OpenAI Codex.
2 parents 69542ec + 639fe3b commit 8481f89

3 files changed

Lines changed: 189 additions & 13 deletions

File tree

‎src/colmap/controllers/feature_matching_utils.cc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -503,21 +503,14 @@ void FeatureMatcherController::Match(
503503

504504
num_outputs += 1;
505505

506-
// If only one of the matches or inlier matches exist, we recompute them
507-
// from scratch and delete the existing results. This must be done before
508-
// pushing the jobs to the queue, otherwise database constraints might fail
509-
// when writing an existing result into the database.
510-
if (exists_two_view_geometry) {
511-
cache_->DeleteTwoViewGeometry(image_id1, image_id2);
512-
}
513-
514506
FeatureMatcherData data;
515507
data.image_id1 = image_id1;
516508
data.image_id2 = image_id2;
509+
data.replace_matches = exists_matches;
510+
data.replace_two_view_geometry = exists_two_view_geometry;
517511

518512
if (exists_matches) {
519513
data.matches = cache_->GetMatches(image_id1, image_id2);
520-
cache_->DeleteMatches(image_id1, image_id2);
521514
THROW_CHECK(verifier_queue_.Push(std::move(data)));
522515
} else {
523516
THROW_CHECK(matcher_queue_.Push(std::move(data)));
@@ -538,8 +531,7 @@ void FeatureMatcherController::Match(
538531
if (!error) {
539532
// Abort: drop the pairs queued for matching, which then never produce
540533
// an output, and wait for the pairs that are already being processed.
541-
// The jobs queued for verification are kept, since some of them carry
542-
// existing matches that were deleted from the database above.
534+
// Keep draining jobs already queued for verification.
543535
error = output.error;
544536
num_outputs -= matcher_queue_.Clear();
545537
}
@@ -551,6 +543,12 @@ void FeatureMatcherController::Match(
551543
output.matches = {};
552544
}
553545

546+
if (output.replace_matches) {
547+
cache_->DeleteMatches(output.image_id1, output.image_id2);
548+
}
549+
if (output.replace_two_view_geometry) {
550+
cache_->DeleteTwoViewGeometry(output.image_id1, output.image_id2);
551+
}
554552
cache_->WriteMatches(output.image_id1, output.image_id2, output.matches);
555553

556554
WriteVerifiedTwoViewGeometry(*cache_,
@@ -665,7 +663,9 @@ void GeometricVerifierController::Verify(
665663

666664
data.matches = cache_->GetMatches(image_id1, image_id2);
667665
// There exists a two view geometry without inlier matches.
668-
if (cache_->ExistsTwoViewGeometry(image_id1, image_id2)) {
666+
data.replace_two_view_geometry =
667+
cache_->ExistsTwoViewGeometry(image_id1, image_id2);
668+
if (data.replace_two_view_geometry) {
669669
data.two_view_geometry = cache_->GetTwoViewGeometry(image_id1, image_id2);
670670
}
671671
THROW_CHECK(verifier_queue_.Push(std::move(data)));
@@ -695,7 +695,7 @@ void GeometricVerifierController::Verify(
695695
output.matches = {};
696696
}
697697

698-
if (cache_->ExistsTwoViewGeometry(output.image_id1, output.image_id2)) {
698+
if (output.replace_two_view_geometry) {
699699
cache_->DeleteTwoViewGeometry(output.image_id1, output.image_id2);
700700
}
701701

‎src/colmap/controllers/feature_matching_utils.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ struct FeatureMatcherData {
2323
// through the remaining workers untouched, and
2424
// FeatureMatcherController::Match rethrows it.
2525
std::exception_ptr error;
26+
// Existing rows to replace only after this job succeeds. Workers leave
27+
// this dispatch metadata unchanged.
28+
bool replace_matches = false;
29+
bool replace_two_view_geometry = false;
2630
};
2731

2832
class FeatureMatcherWorker : public Thread {

‎src/colmap/controllers/feature_matching_utils_test.cc‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,42 @@ TEST(FeatureMatcherController, MatchMultiplePairs) {
286286
EXPECT_EQ(data.database->ReadTwoViewGeometries().size(), 6);
287287
}
288288

289+
TEST(FeatureMatcherController, MatchReplacesExistingGeometryAfterSuccess) {
290+
auto data = CreateTestData(2);
291+
data.database->ClearMatches();
292+
data.database->ClearTwoViewGeometries();
293+
const image_t id1 = data.image_ids[0];
294+
const image_t id2 = data.image_ids[1];
295+
TwoViewGeometry old_geometry;
296+
old_geometry.config = TwoViewGeometry::CALIBRATED;
297+
old_geometry.E = Eigen::Matrix3d::Identity();
298+
old_geometry.inlier_matches = {{0, 0}, {1, 1}};
299+
data.database->WriteTwoViewGeometry(id1, id2, old_geometry);
300+
301+
FeatureMatchingOptions options = DefaultMatchingOptions();
302+
options.skip_geometric_verification = true;
303+
FeatureMatcherController controller(
304+
options, TwoViewGeometryOptions(), data.cache);
305+
ASSERT_TRUE(controller.Setup());
306+
controller.Match({{id1, id2}});
307+
EXPECT_TRUE(data.database->ExistsMatches(id1, id2));
308+
EXPECT_FALSE(data.database->ExistsTwoViewGeometry(id1, id2));
309+
controller.Match({{id1, id2}});
310+
EXPECT_TRUE(data.database->ExistsMatches(id1, id2));
311+
}
312+
289313
TEST(FeatureMatcherController, MatchPropagatesMatcherErrors) {
290314
auto data = CreateTestData(4);
291315
data.database->ClearMatches();
292316
data.database->ClearTwoViewGeometries();
293317

318+
TwoViewGeometry original_geometry;
319+
original_geometry.config = TwoViewGeometry::CALIBRATED;
320+
original_geometry.E = Eigen::Matrix3d::Identity();
321+
original_geometry.inlier_matches = {{0, 0}, {1, 1}};
322+
data.database->WriteTwoViewGeometry(
323+
data.image_ids[0], data.image_ids[1], original_geometry);
324+
294325
// Descriptors of an unexpected dimension make the SIFT matcher throw for all
295326
// pairs with the first image.
296327
std::vector<FeatureDescriptors> descriptors;
@@ -319,12 +350,126 @@ TEST(FeatureMatcherController, MatchPropagatesMatcherErrors) {
319350
EXPECT_FALSE(
320351
data.database->ExistsMatches(data.image_ids[0], data.image_ids[1]));
321352

353+
const auto retained =
354+
data.database->ReadTwoViewGeometry(data.image_ids[0], data.image_ids[1]);
355+
EXPECT_EQ(retained.config, original_geometry.config);
356+
ASSERT_TRUE(retained.E.has_value());
357+
EXPECT_EQ(*retained.E, *original_geometry.E);
358+
EXPECT_FALSE(retained.F.has_value());
359+
EXPECT_FALSE(retained.H.has_value());
360+
EXPECT_FALSE(retained.cam2_from_cam1.has_value());
361+
EXPECT_FALSE(retained.camera1.has_value());
362+
EXPECT_FALSE(retained.camera2.has_value());
363+
ASSERT_EQ(retained.inlier_matches.size(),
364+
original_geometry.inlier_matches.size());
365+
for (size_t i = 0; i < original_geometry.inlier_matches.size(); ++i) {
366+
EXPECT_EQ(retained.inlier_matches[i].point2D_idx1,
367+
original_geometry.inlier_matches[i].point2D_idx1);
368+
EXPECT_EQ(retained.inlier_matches[i].point2D_idx2,
369+
original_geometry.inlier_matches[i].point2D_idx2);
370+
}
371+
322372
// The controller remains usable for pairs without the broken image.
323373
controller.Match({{data.image_ids[1], data.image_ids[2]}});
324374
EXPECT_TRUE(
325375
data.database->ExistsMatches(data.image_ids[1], data.image_ids[2]));
326376
}
327377

378+
TEST(FeatureMatcherController, MatchRetainsRawMatchesOnVerifierError) {
379+
auto data = CreateTestData(3);
380+
data.database->ClearMatches();
381+
data.database->ClearTwoViewGeometries();
382+
const image_t id1 = data.image_ids[0];
383+
const image_t id2 = data.image_ids[1];
384+
const image_t id3 = data.image_ids[2];
385+
FeatureMatches original;
386+
for (point2D_t i = 0; i < 20; ++i) {
387+
original.emplace_back(i, i);
388+
}
389+
data.database->WriteMatches(id1, id2, original);
390+
data.database->WriteMatches(id2, id3, original);
391+
392+
auto invalid_keypoints = data.database->ReadKeypointsBlob(id1);
393+
invalid_keypoints = FeatureKeypointsBlob::Zero(invalid_keypoints.rows(), 3);
394+
const auto keypoints2 = data.database->ReadKeypointsBlob(id2);
395+
const auto keypoints3 = data.database->ReadKeypointsBlob(id3);
396+
data.database->ClearKeypoints();
397+
data.database->WriteKeypoints(id1, invalid_keypoints);
398+
data.database->WriteKeypoints(id2, keypoints2);
399+
data.database->WriteKeypoints(id3, keypoints3);
400+
data.cache = std::make_shared<FeatureMatcherCache>(100, data.database);
401+
402+
FeatureMatcherController controller(
403+
DefaultMatchingOptions(), TwoViewGeometryOptions(), data.cache);
404+
ASSERT_TRUE(controller.Setup());
405+
EXPECT_THAT(
406+
ThrownMessage([&]() { controller.Match({{id1, id2}, {id2, id3}}); }),
407+
testing::HasSubstr("Keypoint format not supported"));
408+
const auto retained = data.database->ReadMatches(id1, id2);
409+
ASSERT_EQ(retained.size(), original.size());
410+
for (size_t i = 0; i < original.size(); ++i) {
411+
EXPECT_EQ(retained[i].point2D_idx1, original[i].point2D_idx1);
412+
EXPECT_EQ(retained[i].point2D_idx2, original[i].point2D_idx2);
413+
}
414+
EXPECT_FALSE(data.database->ExistsTwoViewGeometry(id1, id2));
415+
EXPECT_TRUE(data.database->ExistsTwoViewGeometry(id2, id3));
416+
// Force a new verification job after draining both successful and failed
417+
// jobs.
418+
data.database->DeleteTwoViewGeometry(id2, id3);
419+
ASSERT_FALSE(data.database->ExistsTwoViewGeometry(id2, id3));
420+
controller.Match({{id2, id3}});
421+
EXPECT_TRUE(data.database->ExistsTwoViewGeometry(id2, id3));
422+
}
423+
424+
TEST(FeatureMatcherController, GuidedFailureRetainsRawMatches) {
425+
auto data = CreateTestData(3);
426+
data.database->ClearMatches();
427+
data.database->ClearTwoViewGeometries();
428+
const image_t id1 = data.image_ids[0];
429+
const image_t id2 = data.image_ids[1];
430+
const image_t id3 = data.image_ids[2];
431+
FeatureMatches original;
432+
for (point2D_t i = 0; i < 20; ++i) {
433+
original.emplace_back(i, i);
434+
}
435+
data.database->WriteMatches(id1, id2, original);
436+
437+
auto descriptors1 = data.database->ReadDescriptors(id1);
438+
const auto descriptors2 = data.database->ReadDescriptors(id2);
439+
const auto descriptors3 = data.database->ReadDescriptors(id3);
440+
descriptors1.data =
441+
FeatureDescriptorsData::Zero(descriptors1.data.rows(), 64);
442+
data.database->ClearDescriptors();
443+
data.database->WriteDescriptors(id1, descriptors1);
444+
data.database->WriteDescriptors(id2, descriptors2);
445+
data.database->WriteDescriptors(id3, descriptors3);
446+
data.cache = std::make_shared<FeatureMatcherCache>(100, data.database);
447+
448+
FeatureMatchingOptions matching_options = DefaultMatchingOptions();
449+
matching_options.guided_matching = true;
450+
TwoViewGeometryOptions geometry_options;
451+
// The verifier completes without touching descriptors; guided SIFT checks
452+
// their dimensions even when the geometry was marked DEGENERATE.
453+
geometry_options.min_num_inliers = 200;
454+
FeatureMatcherController controller(
455+
matching_options, geometry_options, data.cache);
456+
ASSERT_TRUE(controller.Setup());
457+
EXPECT_THAT(ThrownMessage([&]() { controller.Match({{id1, id2}}); }),
458+
testing::HasSubstr("kSiftDescriptorDim"));
459+
const auto retained = data.database->ReadMatches(id1, id2);
460+
ASSERT_EQ(retained.size(), original.size());
461+
for (size_t i = 0; i < original.size(); ++i) {
462+
EXPECT_EQ(retained[i].point2D_idx1, original[i].point2D_idx1);
463+
EXPECT_EQ(retained[i].point2D_idx2, original[i].point2D_idx2);
464+
}
465+
EXPECT_FALSE(data.database->ExistsTwoViewGeometry(id1, id2));
466+
// A fresh healthy pair must traverse the workers after the guided error.
467+
ASSERT_FALSE(data.database->ExistsMatches(id2, id3));
468+
controller.Match({{id2, id3}});
469+
EXPECT_TRUE(data.database->ExistsMatches(id2, id3));
470+
EXPECT_TRUE(data.database->ExistsTwoViewGeometry(id2, id3));
471+
}
472+
328473
TEST(FeatureMatcherController, SetupPropagatesMatcherCreationErrors) {
329474
auto data = CreateTestData(2);
330475
FeatureMatchingOptions matching_options(FeatureMatcherType::ALIKED_LIGHTGLUE);
@@ -629,6 +774,33 @@ TEST(GeometricVerifierController, VerifyClearsDegenerateGeometry) {
629774
100);
630775
}
631776

777+
TEST(FeatureMatcherController, MatchReplacesRawMatchesAfterSuccess) {
778+
auto pair_data = CreateLowRatioPairData();
779+
auto& data = pair_data.data;
780+
const image_t id1 = pair_data.image_id1;
781+
const image_t id2 = pair_data.image_id2;
782+
ASSERT_EQ(data.database->ReadMatches(id1, id2).size(), 100);
783+
784+
TwoViewGeometryOptions geometry_options;
785+
geometry_options.min_num_inliers = 200;
786+
FeatureMatcherController controller(
787+
DefaultMatchingOptions(), geometry_options, data.cache);
788+
ASSERT_TRUE(controller.Setup());
789+
controller.Match({{id1, id2}});
790+
791+
ASSERT_TRUE(data.database->ExistsMatches(id1, id2));
792+
EXPECT_TRUE(data.database->ReadMatches(id1, id2).empty());
793+
ASSERT_TRUE(data.database->ExistsTwoViewGeometry(id1, id2));
794+
const auto geometry = data.database->ReadTwoViewGeometry(id1, id2);
795+
EXPECT_EQ(geometry.config, TwoViewGeometry::DEGENERATE);
796+
EXPECT_TRUE(geometry.inlier_matches.empty());
797+
EXPECT_FALSE(geometry.F.has_value());
798+
EXPECT_FALSE(geometry.E.has_value());
799+
EXPECT_FALSE(geometry.H.has_value());
800+
controller.Match({{id1, id2}});
801+
EXPECT_TRUE(data.database->ReadMatches(id1, id2).empty());
802+
}
803+
632804
TEST(FeatureMatcherController, MatchClearsDegenerateGeometry) {
633805
auto pair_data = CreateLowRatioPairData();
634806
auto& data = pair_data.data;

0 commit comments

Comments
 (0)