potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #13774 from l-bat:fix-IE-tests

Browse Source
This commit is contained in:
Alexander Alekhin
2019-02-15 13:54:24 +00:00
parent 3c70d966cb 183c0fcab1
commit 9d3d5e9d65
6 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/layers/lrn_layer.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ public:
{
return backendId == DNN_BACKEND_OPENCV ||
backendId == DNN_BACKEND_HALIDE ||
(backendId == DNN_BACKEND_INFERENCE_ENGINE && (preferableTarget != DNN_TARGET_MYRIAD || type == CHANNEL_NRM));
backendId == DNN_BACKEND_INFERENCE_ENGINE;
}
#ifdef HAVE_OPENCL
modules/dnn/src/layers/normalize_bbox_layer.cpp
+3 -7
View File
@@ -67,14 +67,10 @@ public:
{
if (pnorm != 2)
return false;
if (!blobs.empty())
return true;
if (preferableTarget == DNN_TARGET_MYRIAD)
return !acrossSpatial;
return startAxis == 1 && (!acrossSpatial || endAxis > 1);
return preferableTarget == DNN_TARGET_MYRIAD ? !acrossSpatial : startAxis == 1;
}
else
return backendId == DNN_BACKEND_OPENCV;
return backendId == DNN_BACKEND_OPENCV;
}
bool getMemoryShapes(const std::vector<MatShape> &inputs,
modules/dnn/src/layers/resize_layer.cpp
+2 -3
View File
@@ -54,12 +54,11 @@ public:
#ifdef HAVE_INF_ENGINE
if (backendId == DNN_BACKEND_INFERENCE_ENGINE)
{
return (interpolation == "nearest" && preferableTarget != DNN_TARGET_MYRIAD) ||
return (interpolation == "nearest" && scaleWidth == scaleHeight) ||
(interpolation == "bilinear" && INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2018R4));
}
else
#endif
return backendId == DNN_BACKEND_OPENCV;
return backendId == DNN_BACKEND_OPENCV;
}
virtual void finalize(InputArrayOfArrays inputs_arr, OutputArrayOfArrays outputs_arr) CV_OVERRIDE