Skip to content

Backport elementwise layers refactor#20883

Merged
alalek merged 2 commits intoopencv:3.4from
rogday:eltwise_refactoring
Oct 19, 2021
Merged

Backport elementwise layers refactor#20883
alalek merged 2 commits intoopencv:3.4from
rogday:eltwise_refactoring

Conversation

@rogday
Copy link
Copy Markdown
Member

@rogday rogday commented Oct 15, 2021 •
edited by alalek
Loading

Backport of #20877 to 3.4

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to 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.
  • The feature is well documented and sample code can be built with the project CMake
Xforce_builders=ARMv7,Custom
Xbuild_image:Custom=centos:7
Xbuildworker:Custom=linux-1

force_builders=Custom,Custom Win,Custom Mac
build_image:Custom=ubuntu-openvino-2021.4.1:20.04
build_image:Custom Win=openvino-2021.4.1
build_image:Custom Mac=openvino-2021.4.1

test_modules:Custom=dnn,python2,python3,java
test_modules:Custom Win=dnn,python2,python3,java
test_modules:Custom Mac=dnn,python2,python3,java

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

@rogday rogday force-pushed the eltwise_refactoring branch from c6d6ab5 to 75c9a26 Compare October 15, 2021 12:53
@rogday rogday requested a review from sl-sergei October 15, 2021 13:53
alalek
alalek reviewed Oct 15, 2021
View reviewed changes
modules/dnn/src/layers/elementwise_layers.cpp Outdated

size_t gSize = src.total();
CV_Assert(kernel.run(1, &gSize, NULL, false));
CV_Assert(kernel.run(1, &gSize, nullptr, false));
Copy link
Copy Markdown
Member

@alalek alalek Oct 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep NULL here

Copy link
Copy Markdown
Member Author

@rogday rogday Oct 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you suggest any flags besides -DCMAKE_CXX_STANDARD=98, so that I can catch these kind of bugs locally?

Copy link
Copy Markdown
Member

@alalek alalek Oct 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This case is catched by the old GCC 4.x compiler

alalek
alalek approved these changes Oct 18, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done! Thank you 👍

@alalek alalek merged commit b3f966e into opencv:3.4 Oct 19, 2021
@rogday rogday deleted the eltwise_refactoring branch October 19, 2021 14:07
@alalek alalek mentioned this pull request Oct 23, 2021
Merged
@alalek alalek mentioned this pull request Dec 30, 2021
Merged
@alalek alalek mentioned this pull request Feb 22, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

@sl-sergei sl-sergei Awaiting requested review from sl-sergei

Assignees

@alalek alalek

Labels

category: dnn

Projects

None yet

Milestone

3.4.17

Development

Successfully merging this pull request may close these issues.

2 participants

@rogday @alalek