Skip to content

ONNX graphs simplifier#16291

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
dkurt:dnn_onnx_graph_simplifier
Jan 14, 2020
Merged

ONNX graphs simplifier#16291
opencv-pushbot merged 1 commit intoopencv:3.4from
dkurt:dnn_onnx_graph_simplifier

Conversation

@dkurt
Copy link
Copy Markdown
Member

@dkurt dkurt commented Jan 6, 2020 •
edited
Loading

This pullrequest changes

resolves #15244

Share graphs simplification logic from TensorFlow importer to ONNX importer.

Merge with extra: opencv/opencv_extra#694

force_builders=Custom,Custom Win,Custom Mac
build_image:Custom=ubuntu-openvino-2019r3.0:16.04
build_image:Custom Win=openvino-2019r3.0
build_image:Custom Mac=openvino-2019r3.0

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=*

@dkurt dkurt mentioned this pull request Jan 6, 2020
Closed
@dkurt dkurt force-pushed the dnn_onnx_graph_simplifier branch from 24a1aa5 to 09fe8c4 Compare January 6, 2020 12:15
alalek
alalek reviewed Jan 8, 2020
View reviewed changes
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
std::vector<Ptr<Subgraph> > subgraphs;
subgraphs.push_back(Ptr<Subgraph>(new SoftMaxSubgraph()));

simplifySubgraphs(Ptr<ImportGraphWrapper>(new ONNXGraphWrapper(net)), subgraphs);
Copy link
Copy Markdown
Member

@alalek alalek Jan 8, 2020

Choose a reason for hiding this comment

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

makePtr for these 2 cases

Copy link
Copy Markdown
Member Author

@dkurt dkurt Jan 14, 2020

Choose a reason for hiding this comment

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

cannot do it for ONNXGraphWrapper due it uses non-const reference to delete nodes from the net. But makePtr works with const arguments:

opencv/modules/core/include/opencv2/core/cvstd_wrapper.hpp

Lines 25 to 26 in b58b2c5

template<typename _Tp, typename ... A1> static inline
Ptr<_Tp> makePtr(const A1&... a1) { return std::make_shared<_Tp>(a1...); }

@dkurt dkurt force-pushed the dnn_onnx_graph_simplifier branch from 09fe8c4 to b610541 Compare January 14, 2020 09:25
@dkurt dkurt force-pushed the dnn_onnx_graph_simplifier branch from b610541 to c1c84d2 Compare January 14, 2020 09:46
alalek
alalek approved these changes Jan 14, 2020
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.

Thank you 👍

opencv-pushbot pushed a commit that referenced this pull request Jan 14, 2020
@alalek
Merge pull request #16291 from dkurt:dnn_onnx_graph_simplifier
a67228c
@opencv-pushbot opencv-pushbot merged commit c1c84d2 into opencv:3.4 Jan 14, 2020
@alalek alalek mentioned this pull request Jan 14, 2020
Merged
mshabunin
mshabunin reviewed Jan 15, 2020
View reviewed changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mshabunin mshabunin mshabunin left review comments

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: dnn feature

Projects

None yet

Milestone

3.4.10

Development

Successfully merging this pull request may close these issues.

4 participants

@dkurt @mshabunin @alalek @opencv-pushbot