mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20478 from rogday:onnx_refactor_master

Browse Source
This commit is contained in:
Alexander Alekhin 2021-07-30 14:38:45 +00:00
commit 610e3dccb7
3 changed files with 1744 additions and 1542 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dnn/src/dnn_common.hpp
View File

@ -14,6 +14,7 @@ Mutex& getInitializationMutex();
void initializeLayerFactory(); void initializeLayerFactory();
namespace detail { namespace detail {
#define CALL_MEMBER_FN(object, ptrToMemFn) ((object).*(ptrToMemFn))
class NotImplemented : public Layer class NotImplemented : public Layer
{ {

3283
modules/dnn/src/onnx/onnx_importer.cpp
View File

File diff suppressed because it is too large Load Diff

2
modules/dnn/src/tensorflow/tf_importer.cpp
View File

@ -2894,7 +2894,7 @@ void TFImporter::parseNode(const tensorflow::NodeDef& layer)
DispatchMap::const_iterator iter = dispatch.find(type); DispatchMap::const_iterator iter = dispatch.find(type);
if (iter != dispatch.end()) if (iter != dispatch.end())
{ {
((*this).*(iter->second))(net, layer, layerParams); CALL_MEMBER_FN(*this, iter->second)(net, layer, layerParams);
} }
else if (!DNN_DIAGNOSTICS_RUN || !layerHandler->handleMissing(layer)) else if (!DNN_DIAGNOSTICS_RUN || !layerHandler->handleMissing(layer))
{ {