potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages 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
parent e9db7fea5b 27392f832d
commit 610e3dccb7
3 changed files with 1744 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/dnn_common.hpp
+1
View File
@@ -14,6 +14,7 @@ Mutex& getInitializationMutex();
void initializeLayerFactory();
namespace detail {
#define CALL_MEMBER_FN(object, ptrToMemFn) ((object).*(ptrToMemFn))
class NotImplemented : public Layer
{
modules/dnn/src/onnx/onnx_importer.cpp
+1742 -1541
View File
File diff suppressed because it is too large Load Diff
modules/dnn/src/tensorflow/tf_importer.cpp
+1 -1
View File
@@ -2894,7 +2894,7 @@ void TFImporter::parseNode(const tensorflow::NodeDef& layer)
DispatchMap::const_iterator iter = dispatch.find(type);
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))
{