Conditional compilation for network reader
authorIlya Lavrenov <ilya.lavrenov@intel.com>
Mon, 22 Jun 2020 08:45:56 +0000 (11:45 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 23 Jun 2020 11:15:52 +0000 (14:15 +0300)
origibal commit: 63e92cccf2c38c3c7a041d7968063a9a2445d40c

modules/dnn/test/test_ie_models.cpp

index 74edf02..f668567 100644 (file)
@@ -136,12 +136,6 @@ void runIE(Target target, const std::string& xmlPath, const std::string& binPath
 {
     SCOPED_TRACE("runIE");
 
-    CNNNetReader reader;
-    reader.ReadNetwork(xmlPath);
-    reader.ReadWeights(binPath);
-
-    CNNNetwork net = reader.getNetwork();
-
     std::string device_name;
 
 #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;
     InferencePlugin plugin;
 #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;
     InferRequest infRequest;