Merge pull request #17633 from alalek:backport_17616

pull/18084/head
Alexander Alekhin 4 years ago
commit 8cc8b0d2b4
  1. 17
      modules/dnn/test/test_ie_models.cpp

@ -136,12 +136,6 @@ void runIE(Target target, const std::string& xmlPath, const std::string& binPath
{ {
SCOPED_TRACE("runIE"); SCOPED_TRACE("runIE");
CNNNetReader reader;
reader.ReadNetwork(xmlPath);
reader.ReadWeights(binPath);
CNNNetwork net = reader.getNetwork();
std::string device_name; std::string device_name;
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_GT(2019010000) #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_GT(2019010000)
@ -150,6 +144,17 @@ void runIE(Target target, const std::string& xmlPath, const std::string& binPath
InferenceEnginePluginPtr enginePtr; InferenceEnginePluginPtr enginePtr;
InferencePlugin plugin; InferencePlugin plugin;
#endif #endif
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_GT(2019030000)
CNNNetwork net = ie.ReadNetwork(xmlPath, binPath);
#else
CNNNetReader reader;
reader.ReadNetwork(xmlPath);
reader.ReadWeights(binPath);
CNNNetwork net = reader.getNetwork();
#endif
ExecutableNetwork netExec; ExecutableNetwork netExec;
InferRequest infRequest; InferRequest infRequest;

Loading…
Cancel
Save