-
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
[refactor] Replace sift_roi binary by shared library and ctypes #193
Merged
dyoussef
merged 44 commits into
MISS3D:master
from
jmichel-otb:refac_remove_sift_binary
Mar 13, 2019
Merged
[refactor] Replace sift_roi binary by shared library and ctypes #193
dyoussef
merged 44 commits into
MISS3D:master
from
jmichel-otb:refac_remove_sift_binary
Mar 13, 2019
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
…l (except time processing)
…that library is available at module import
dyoussef
approved these changes
Feb 27, 2019
carlodef
approved these changes
Mar 12, 2019
carlodef
referenced
this pull request
in centreborelli/s2p
Mar 15, 2019
carlodef
added a commit
to amiotc/s2p
that referenced
this pull request
Mar 26, 2019
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 modifies the
image_keypoints
implementation insift.py
module, while preserving its API (to the exception of theextra_params
option which had to be removed).It now reads the roi with
rasterio
into anumpy
array, pass it to thekeypoints_from_nparray
, which will call the actual C++ sift code withctypes
and return the sift points and descriptors in anothernumpy
array. This array is then written to the txt file usingnumpy
io.I had to fix a bunch of bugs in the sift test itself. I also
autopep8
thesift.py
file which explains minor diff outside of methods cited above.the
libsift4ctypes.so
shared library is installed ins2p/lib
. Relative path is hardcoded insift.py
, which allow the whole thing to work without updatingLD_LIBRARY_PATH
. However a cleaner solution would be to manage theLD_LIBRARY_PATH
in a config script (out of the scope of this PR).