Ellipses supported added for Einsum Layer#24322
Merged
asmorkalov merged 6 commits intoopencv:4.xfrom Oct 24, 2023
Merged
Conversation
Contributor
|
Contributor
|
@Abdurrahheem Thanks a lot for the patch! The PR adds 2 features, but only one test. Could you cover both? |
asmorkalov
reviewed
Oct 2, 2023
asmorkalov
reviewed
Oct 3, 2023
| for (int slice = 0; slice < total_slices; ++slice) { | ||
| for (int j = 0; j < inner_stride; ++j) { | ||
| // Extract diagonal elements | ||
| output.at<T>(slice, j, 0) = input.at<T>(slice, j, j); |
Contributor
There was a problem hiding this comment.
Looks like the 3rd dimension is redundant. You can create output mat with 2 dimensions and drop reshape at the end.
Contributor
Author
There was a problem hiding this comment.
tested suggestion. This breaks the the tests. Let's leave as it is maybe? since the suggestion only reduces one reshape operation
dkurt
reviewed
Oct 6, 2023
fengyuentau
reviewed
Oct 6, 2023
Contributor
|
@dkurt @fengyuentau Please take a look again. |
dkurt
reviewed
Oct 11, 2023
| } | ||
|
|
||
| // Reshape output back to original shape | ||
| original_dims[rank - 1] = 1; // Set the last dimension to 1, as we have extracted the diagonal |
Member
There was a problem hiding this comment.
Why not initialize output with the final dimensions once but int the loop work with a data pointer?
Contributor
Author
There was a problem hiding this comment.
changed. now without reshape
dkurt
reviewed
Oct 11, 2023
| for (int slice = 0; slice < total_slices; ++slice) { | ||
| for (int j = 0; j < inner_stride; ++j) { | ||
| // Extract diagonal elements | ||
| output.at<T>(slice, j, 0) = input.at<T>(slice, j, j); |
Member
There was a problem hiding this comment.
This method can be without template by using cv::Mat::diag:
input = input(1, total_slices);
output = output.reshape(1, total_slices);
for (int slice = 0; slice < total_slices; ++slice) {
Mat src = input.row(slice).reshape(1, inner_stride).diag(0);
Mat dst = output.row(slice);
src.copyTo(dst);
}
Contributor
Author
There was a problem hiding this comment.
tested, this introduces regression in accuracy
dkurt
reviewed
Oct 11, 2023
|
|
||
| if (output_dims != shape(output)){ | ||
| CV_Error(Error::StsError, "Output shape does not match with calculated shape"); | ||
| } |
Member
There was a problem hiding this comment.
Do we really need output_dims as it's used only for the check?
Contributor
Author
There was a problem hiding this comment.
do we not need to check?
Member
There was a problem hiding this comment.
We probably initialize output somewhere once in the code with such shapes.
Contributor
Author
There was a problem hiding this comment.
output shape for this particular function is not saved anywhere. However, overall output shape is save, of course. Because of this I need to check the outputs for compatibility.
Contributor
|
@dkurt please take a look again. |
dkurt
approved these changes
Oct 24, 2023
asmorkalov
pushed a commit
to opencv/opencv_extra
that referenced
this pull request
Oct 24, 2023
Test case for Einsum ellipse functionality #1106 This PR contains test case for Einsum Ellipses addition patch [#24322](opencv/opencv#24322)
Merged
IskXCr
pushed a commit
to Haosonn/opencv
that referenced
this pull request
Dec 20, 2023
Ellipses supported added for Einsum Layer opencv#24322 This PR added addresses issues not covered in opencv#24037. Namely these are: Test case for this patch is in this PR [opencv#1106](opencv/opencv_extra#1106) in opencv extra Added: - [x] Broadcasting reduction "...ii ->...I" - [x] Add lazy shape deduction. "...ij, ...jk->...ik" Features to add: - [ ] Add implicit output computation support. "bij,bjk ->" (output subscripts should be "bik") - [ ] Add support for CUDA backend - [ ] BatchWiseMultiply optimize - [ ] Performance test ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
thewoz
pushed a commit
to thewoz/opencv
that referenced
this pull request
Jan 4, 2024
Ellipses supported added for Einsum Layer opencv#24322 This PR added addresses issues not covered in opencv#24037. Namely these are: Test case for this patch is in this PR [opencv#1106](opencv/opencv_extra#1106) in opencv extra Added: - [x] Broadcasting reduction "...ii ->...I" - [x] Add lazy shape deduction. "...ij, ...jk->...ik" Features to add: - [ ] Add implicit output computation support. "bij,bjk ->" (output subscripts should be "bik") - [ ] Add support for CUDA backend - [ ] BatchWiseMultiply optimize - [ ] Performance test ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
thewoz
pushed a commit
to thewoz/opencv
that referenced
this pull request
May 29, 2024
Ellipses supported added for Einsum Layer opencv#24322 This PR added addresses issues not covered in opencv#24037. Namely these are: Test case for this patch is in this PR [opencv#1106](opencv/opencv_extra#1106) in opencv extra Added: - [x] Broadcasting reduction "...ii ->...I" - [x] Add lazy shape deduction. "...ij, ...jk->...ik" Features to add: - [ ] Add implicit output computation support. "bij,bjk ->" (output subscripts should be "bik") - [ ] Add support for CUDA backend - [ ] BatchWiseMultiply optimize - [ ] Performance test ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 added addresses issues not covered in #24037. Namely these are:
Test case for this patch is in this PR #1106 in opencv extra
Added:
Features to add:
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.