potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +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-11-19 19:13:38 +00:00
parent cf93217365 9d14c0b37a
commit 318cba4ce3
19 changed files with 257 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/op_inf_engine.cpp
+2 -1
View File
@@ -610,7 +610,7 @@ void InfEngineBackendNet::initPlugin(InferenceEngine::CNNNetwork& net)
{
candidates.push_back(param_pluginPath);
}
#if INF_ENGINE_VER_MAJOR_LE(INF_ENGINE_RELEASE_2019R3)
if (device_name == "CPU" || device_name == "FPGA")
{
std::string suffixes[] = {"_avx2", "_sse4", ""};
@@ -633,6 +633,7 @@ void InfEngineBackendNet::initPlugin(InferenceEngine::CNNNetwork& net)
#endif // _WIN32
}
}
#endif
bool found = false;
for (size_t i = 0; i != candidates.size(); ++i)
{