Merge pull request opencv#17993 from Maxim-Doronin:vpu/mdoronin/refactor_vpu_configs

alalek · alalek · commit 41548a091b2c · 2020-08-17T19:20:04.000Z
diff --git a/modules/dnn/src/ie_ngraph.cpp b/modules/dnn/src/ie_ngraph.cpp
@@ -684,7 +684,11 @@ void InfEngineNgraphNet::initPlugin(InferenceEngine::CNNNetwork& net)
         }
         std::map<std::string, std::string> config;
         if (device_name == "MYRIAD") {
+#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
+            config.emplace("MYRIAD_DETECT_NETWORK_BATCH", CONFIG_VALUE(NO));
+#else
             config.emplace("VPU_DETECT_NETWORK_BATCH", CONFIG_VALUE(NO));
+#endif
         }
 
         bool isHetero = device_name == "FPGA";

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,11 @@ void InfEngineNgraphNet::initPlugin(InferenceEngine::CNNNetwork& net)`
`684`	`684`	`}`
`685`	`685`	`std::map<std::string, std::string> config;`
`686`	`686`	`if (device_name == "MYRIAD") {`
	`687`	`+#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)`
	`688`	`+ config.emplace("MYRIAD_DETECT_NETWORK_BATCH", CONFIG_VALUE(NO));`
	`689`	`+#else`
`687`	`690`	`config.emplace("VPU_DETECT_NETWORK_BATCH", CONFIG_VALUE(NO));`
	`691`	`+#endif`
`688`	`692`	`}`
`689`	`693`
`690`	`694`	`bool isHetero = device_name == "FPGA";`