Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Deduplicate SIFT tests#4220

Merged
ahojnnes merged 1 commit into
maincolmap/colmap:mainfrom
user/jsch/sift-test-consolidatecolmap/colmap:user/jsch/sift-test-consolidateCopy head branch name to clipboard
Mar 10, 2026
Merged

Deduplicate SIFT tests#4220
ahojnnes merged 1 commit into
maincolmap/colmap:mainfrom
user/jsch/sift-test-consolidatecolmap/colmap:user/jsch/sift-test-consolidateCopy head branch name to clipboard

Conversation

@ahojnnes

Copy link
Copy Markdown
Contributor

No change in behavior.

@ahojnnes
ahojnnes enabled auto-merge (squash) March 10, 2026 10:21
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request focuses on enhancing the test suite for SIFT feature extraction and matching by introducing significant refactoring. The changes aim to improve the maintainability, readability, and conciseness of the tests through the use of helper functions, parameterized tests, and a dedicated GPU test runner, without altering the existing behavior or functionality of the SIFT algorithms.

Highlights

  • Test Refactoring: Introduced several helper functions to encapsulate common assertions and setup logic for SIFT feature tests, significantly reducing code duplication.
  • Parameterized Tests: Converted multiple individual CPU SIFT feature extraction tests into a single parameterized test suite, making it easier to add and manage test cases.
  • GPU Test Utility: Implemented a RunGpuTest utility function to streamline the setup and execution of GPU-dependent tests, removing repetitive boilerplate code from individual test cases.
  • Code Deduplication: Refactored various SIFT feature extraction and matching tests to leverage the new helper functions and parameterized test structure, improving overall test readability and maintainability.
Changelog
  • src/colmap/feature/sift_test.cc
    • Added #include <functional> for std::function usage.
    • Introduced helper functions ValidateKeypoints, ValidateDescriptorNorms, ExpectReversedMatches, ExpectReversedInlierMatches, CreatePlanarTwoViewGeometry, and RunGpuTest to centralize common test logic.
    • Replaced multiple distinct CPU SIFT extraction tests with a single parameterized test (SiftCpuExtractionTest) using ::testing::TestWithParam.
    • Refactored existing GPU feature extraction and matching tests to utilize the new RunGpuTest helper and assertion functions, eliminating repetitive setup code.
    • Updated SiftCPUFeatureMatcher.Nominal and MatchGuidedSiftFeaturesCPU.Nominal to use the new helper functions for match assertions and geometry creation.
    • Modified MatchSiftFeaturesCPUvsGPU.Nominal to integrate the new helper functions and RunGpuTest for cleaner CPU-GPU comparison tests.
Activity
  • No human activity has been recorded for this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request does a great job of deduplicating the SIFT tests. Extracting common validation logic into helper functions like ValidateKeypoints, ValidateDescriptorNorms, ExpectReversedMatches, and ExpectReversedInlierMatches significantly improves readability and maintainability. The introduction of RunGpuTest to encapsulate GPU test boilerplate and the use of a parameterized test SiftCpuExtractionTest to replace multiple similar tests are excellent refactoring choices. I've made a couple of minor suggestions to use ASSERT_EQ instead of EXPECT_EQ for size checks in the new helper functions to ensure test correctness and prevent potential out-of-bounds access, which was the behavior before this refactoring.

Comment thread src/colmap/feature/sift_test.cc
Comment thread src/colmap/feature/sift_test.cc
@ahojnnes
ahojnnes merged commit aa333f5 into main Mar 10, 2026
17 of 19 checks passed
@ahojnnes
ahojnnes deleted the user/jsch/sift-test-consolidate branch March 10, 2026 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.