From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Thu, 19 Dec 2019 10:00:07 +0000 (+0000)
Subject: Merge pull request #16034 from Quantizs:irLoadFromBuffer
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~3^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4342657762dea086f5f5d4a9b25fa0df15830d2e;p=platform%2Fupstream%2Fopencv.git

Merge pull request #16034 from Quantizs:irLoadFromBuffer
---

4342657762dea086f5f5d4a9b25fa0df15830d2e
diff --cc modules/dnn/src/dnn.cpp
index eb87d2c,e2c296b..462a4b9
--- a/modules/dnn/src/dnn.cpp
+++ b/modules/dnn/src/dnn.cpp
@@@ -2957,25 -2921,13 +2962,14 @@@ Net::Net() : impl(new Net::Impl
  {
  }
  
- Net Net::readFromModelOptimizer(const String& xml, const String& bin)
+ #ifdef HAVE_INF_ENGINE
+ /*static*/
+ Net Net::Impl::createNetworkFromModelOptimizer(InferenceEngine::CNNNetwork& ieNet)
  {
- #ifndef HAVE_INF_ENGINE
-     CV_Error(Error::StsError, "Build OpenCV with Inference Engine to enable loading models from Model Optimizer.");
- #else
- 
- #if INF_ENGINE_VER_MAJOR_LE(INF_ENGINE_RELEASE_2019R3)
-     InferenceEngine::CNNNetReader reader;
-     reader.ReadNetwork(xml);
-     reader.ReadWeights(bin);
- 
-     InferenceEngine::CNNNetwork ieNet = reader.getNetwork();
- #else
-     InferenceEngine::Core& ie = getCore();
-     InferenceEngine::CNNNetwork ieNet = ie.ReadNetwork(xml, bin);
- #endif
+     CV_TRACE_FUNCTION();
  
      std::vector<String> inputsNames;
 +    std::vector<MatShape> inp_shapes;
      for (auto& it : ieNet.getInputsInfo())
      {
          inputsNames.push_back(it.first);