Use linalg & inline _get_manders_overlap_coeff
#578
Merged
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
jakirkham
added
bug
jakirkham
changed the title
sqrt in _get_manders_overlap_coeffnorm in _get_manders_overlap_coeff
jakirkham
changed the title
norm in _get_manders_overlap_coeff_get_manders_overlap_coeff
jakirkham
changed the title
_get_manders_overlap_coeff_get_manders_overlap_coeff
|
@grlee77 would be curious to hear your thoughts on this approach 🙂 |
jakirkham
commented
Jul 14, 2023
Comment on lines
+258
to
+259
| denom = cp.linalg.norm(image0) * cp.linalg.norm(image1) | ||
| return cp.vdot(image0, image1) / denom |
There was a problem hiding this comment.
We could go further here and do
1 - cupyx.scipy.spatial.distance.cosine(image0, image1)This was added in PR ( cupy/cupy#7063 ) and would require CuPy 12.0.0+ & pylibraft from RAPIDS
There was a problem hiding this comment.
Looks like we have to ravel to 1D to use the cosine solution and then do a subtraction to get the equivalent result of the linalg implementation:
1 - cosine(image0.reshape(1, -1), image1.reshape(1, -1))If the RAFT solution is faster we can provide it with fallback to the linalg one here when unavailable. In my initial testing it was slower than using linalg in this case, so let's just keep the suggested solution here for now.
There was a problem hiding this comment.
Sounds good. Thanks Greg! 🙏
grlee77
approved these changes
Jul 17, 2023
|
/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.
As most of the operations in
_get_manders_overlap_coeffcan be constructed from other linalg operations, use those directly to compute the result. Once this is done, there is less of a need tofuseit into a kernel. Instead those linalg functions can just be called as-is.Note: This resolves a bug seen with
test_mocin the CUDA 11.2 CI on the CUDA 12 PR ( #572 (comment) ) ( #572 (comment) )