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 remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-12-12 13:02:19 +03:00
parent 121bc50ca9 1c4a64f0a1
commit 92b9888837
34 changed files with 1109 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/op_inf_engine.cpp
+6 -1
View File
@@ -751,11 +751,16 @@ void InfEngineBackendNet::initPlugin(InferenceEngine::CNNNetwork& net)
{
if (layer->type == kOpenCVLayersType)
{
layer->affinity = "CPU";
isHetero = true;
#if INF_ENGINE_VER_MAJOR_LT(INF_ENGINE_RELEASE_2019R3)
// Not sure about lower versions but in 2019R3 we do not need this
layer->affinity = "CPU";
}
else
{
layer->affinity = device_name;
#endif
}
}
}
if (isHetero)