potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9305 from dkurt:public_dnn_importer_is_deprecated

Browse Source
This commit is contained in:
Vadim Pisarevsky
2017-09-18 09:35:35 +00:00
parent 70c5d69640 bd8e6b7e14
commit f7df5dd32c
17 changed files with 86 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/caffe/caffe_importer.cpp
+5 -14
View File
@@ -385,24 +385,15 @@ Ptr<Importer> createCaffeImporter(const String &prototxt, const String &caffeMod
return Ptr<Importer>(new CaffeImporter(prototxt.c_str(), caffeModel.c_str()));
}
#else //HAVE_PROTOBUF
Ptr<Importer> createCaffeImporter(const String&, const String&)
Net readNetFromCaffe(const String &prototxt, const String &caffeModel /*= String()*/)
{
CV_Error(cv::Error::StsNotImplemented, "libprotobuf required to import data from Caffe models");
return Ptr<Importer>();
CaffeImporter caffeImporter(prototxt.c_str(), caffeModel.c_str());
Net net;
caffeImporter.populateNet(net);
return net;
}
#endif //HAVE_PROTOBUF
Net readNetFromCaffe(const String &prototxt, const String &caffeModel /*= String()*/)
{
Ptr<Importer> caffeImporter = createCaffeImporter(prototxt, caffeModel);
Net net;
if (caffeImporter)
caffeImporter->populateNet(net);
return net;
}
CV__DNN_EXPERIMENTAL_NS_END
}} // namespace
modules/dnn/src/tensorflow/tf_importer.cpp
+2 -3
View File
@@ -1098,10 +1098,9 @@ Ptr<Importer> createTensorflowImporter(const String&)
Net readNetFromTensorflow(const String &model)
{
Ptr<Importer> importer = createTensorflowImporter(model);
TFImporter importer(model.c_str());
Net net;
if (importer)
importer->populateNet(net);
importer.populateNet(net);
return net;
}
modules/dnn/src/torch/torch_importer.cpp
+2 -3
View File
@@ -1150,10 +1150,9 @@ Net readNetFromTorch(const String &model, bool isBinary)
{
CV_TRACE_FUNCTION();
Ptr<Importer> importer = createTorchImporter(model, isBinary);
TorchImporter importer(model, isBinary);
Net net;
if (importer)
importer->populateNet(net);
importer.populateNet(net);
return net;
}