-
Notifications
You must be signed in to change notification settings - Fork 77
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
Refac matching binary ctypes #202
Open
amiotc
wants to merge
11
commits into
MISS3D:master
Choose a base branch
from
amiotc:refac_matching_binary_ctypes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
matching call with ctypes
This module is rewritten in order to get rid of the keypoints structures
carlodef
previously approved these changes
Mar 26, 2019
Thank you @amiotc. I've fixed a coordinates swap in the file |
carlodef
approved these changes
Apr 8, 2019
@carlodef I have checked your modifications. Everything seems fine for me. Thank you for the bugfix. |
@amiotc Great, thank you! So now if @jmichel-otb and @dyoussef approve the pull request I think that we can merge. |
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.
This PR follows the same logic as PR #193. It modifies the
keypoints_match
implementation insift.py
module, while preserving its API.SIFT keypoints are now read from the txt file generated at the previous step, and stored into numpy arrays. These arrays are passed to
keypoints_match_from_nparray
, which calls the C++ code performing matches between two sets of SIFT keypoints.The actual matching C code has been rewritten in the
sift4ctypes.cpp
file. The former matching implementation was using multiple C structures, which would have implied to format all the numpy arrays into these structures, and extract the returned structure into a numpy array. Also, most of the information stored in these structures was useless for the matching algorithm. Hence, rewriting the functions so that they accept arrays instead of the defined structures seemed the best option.The called library returns an array, which is transformed in a numpy array and written in a text file.