mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 11:45:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10061 from Sahloul:dnn_torch_fix

Browse Source
This commit is contained in:
Alexander Alekhin 2017-11-10 05:05:52 +00:00
commit bafdc44d37
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/dnn/src/torch/torch_importer.cpp
View File

@ -1198,6 +1198,16 @@ Mat readTorchBlob(const String &filename, bool isBinary)
return importer->tensors.begin()->second;
}
Net readNetFromTorch(const String &model, bool isBinary)
{
CV_TRACE_FUNCTION();
TorchImporter importer(model, isBinary);
Net net;
importer.populateNet(net);
return net;
}
#else
Ptr<Importer> createTorchImporter(const String&, bool)
@ -1212,17 +1222,13 @@ Mat readTorchBlob(const String&, bool)
return Mat();
}
#endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
Net readNetFromTorch(const String &model, bool isBinary)
{
CV_TRACE_FUNCTION();
TorchImporter importer(model, isBinary);
Net net;
importer.populateNet(net);
return net;
CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build");
return Net();
}
#endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
CV__DNN_EXPERIMENTAL_NS_END
}} // namespace