Split layer dispatch into functions in ONNXImporter#20453
Merged
alalek merged 5 commits intoopencv:3.4from Jul 28, 2021
Merged
Conversation
Member
|
Need to rebase to resolve conflicts after #20450 |
alalek
reviewed
Jul 27, 2021
| typedef void (ONNXImporter::*ONNXImporterNodeParser)(LayerParams& layerParams, opencv_onnx::NodeProto node_proto); | ||
| typedef std::map<std::string, ONNXImporterNodeParser> DispatchMap; | ||
|
|
||
| void parseMaxPool (LayerParams& layerParams, opencv_onnx::NodeProto node_proto); |
Member
There was a problem hiding this comment.
opencv_onnx::NodeProto
"const reference" to avoid unnecessary objects copying.
Only some of handlers need local own instances to provide modifications (these code parts looks bad).
asmorkalov
approved these changes
Jul 28, 2021
alalek
reviewed
Jul 29, 2021
| @@ -62,7 +62,7 @@ class ONNXImporter | |||
| public: | |||
|
|
|||
| ONNXImporter(Net& net, const char *onnxFile) | |||
| : dstNet(net) | |||
| : dstNet(net), dispatch(buildDispatchMap()) | |||
Member
There was a problem hiding this comment.
We need PR to master branch with merge of these changes and "diagnostic run" mode.
6 tasks
Merged
Merged
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
3 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.
I encountered strange behavior of model diagnostic tool when I was registering a custom layer: the tool indicated that the layer was probably missing, when we can know for sure; this change will enable easier debug and cleaner implementation of model diagnostics.
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.