-
-
Notifications
You must be signed in to change notification settings - Fork 55.7k
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
Add eigen tensor conversions #17320
Merged
Merged
Add eigen tensor conversions #17320
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
7a2540d
add eigen tensor conversion functions
jgbradley1 6ea7f34
add eigen tensor conversion tests
jgbradley1 c0c457c
add support for column major order
jgbradley1 8a1eed3
update eigen tensor tests
jgbradley1 112b017
fix coding style and add conditional compilation
jgbradley1 fc76074
fix conditional compilation checks
jgbradley1 d5d5d5f
remove whitespace
jgbradley1 776a2d5
rearrange functions for easier reading
jgbradley1 c477a08
reformat function documentation and add tensormap unit test
jgbradley1 b8a97b3
cleanup documentation of unit test
jgbradley1 24e0252
remove condition duplication
jgbradley1 021a5c5
check Eigen major version, not minor version
jgbradley1 486e033
restrict to Eigen v3.3.0+
jgbradley1 e6cb44f
add documentation note and add type checking to cv2eigen_tensormap()
jgbradley1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Type check is required here through
CV_CheckTypeEQ(mat.type(), traits::Type<_Tp>::value, "")
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The suggestion almost worked. I had to modify to account for multiple channels.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jgbradley1 You are right!
Perhaps this one should be clear:
CV_CheckDepthEQ(mat.depth(), traits::Depth<_Tp>::value, "");
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, checking the depth would have been clear (and less verbose code). It doesn’t matter to me which approach we use. Since you already approved the merge, I’ll let you decide if it’s worth opening up another PR to update the code.