mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects 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
commit 9d3d5e9d65
6 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dnn/perf/perf_net.cpp
View File

@ -124,7 +124,6 @@ PERF_TEST_P_(DNNTestNetwork, SSD)
PERF_TEST_P_(DNNTestNetwork, OpenFace) PERF_TEST_P_(DNNTestNetwork, OpenFace)
{ {
if (backend == DNN_BACKEND_HALIDE || if (backend == DNN_BACKEND_HALIDE ||
(backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_OPENCL_FP16) ||
(backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_MYRIAD)) (backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_MYRIAD))
throw SkipTestException(""); throw SkipTestException("");
processNet("dnn/openface_nn4.small2.v1.t7", "", "", processNet("dnn/openface_nn4.small2.v1.t7", "", "",

2
modules/dnn/src/layers/lrn_layer.cpp
View File

@ -92,7 +92,7 @@ public:
{ {
return backendId == DNN_BACKEND_OPENCV || return backendId == DNN_BACKEND_OPENCV ||
backendId == DNN_BACKEND_HALIDE || backendId == DNN_BACKEND_HALIDE ||
(backendId == DNN_BACKEND_INFERENCE_ENGINE && (preferableTarget != DNN_TARGET_MYRIAD || type == CHANNEL_NRM)); backendId == DNN_BACKEND_INFERENCE_ENGINE;
} }
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL

8
modules/dnn/src/layers/normalize_bbox_layer.cpp
View File

@ -67,13 +67,9 @@ public:
{ {
if (pnorm != 2) if (pnorm != 2)
return false; return false;
if (!blobs.empty())
return true; return preferableTarget == DNN_TARGET_MYRIAD ? !acrossSpatial : startAxis == 1;
if (preferableTarget == DNN_TARGET_MYRIAD)
return !acrossSpatial;
return startAxis == 1 && (!acrossSpatial || endAxis > 1);
} }
else
return backendId == DNN_BACKEND_OPENCV; return backendId == DNN_BACKEND_OPENCV;
} }

3
modules/dnn/src/layers/resize_layer.cpp
View File

@ -54,10 +54,9 @@ public:
#ifdef HAVE_INF_ENGINE #ifdef HAVE_INF_ENGINE
if (backendId == DNN_BACKEND_INFERENCE_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)); (interpolation == "bilinear" && INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2018R4));
} }
else
#endif #endif
return backendId == DNN_BACKEND_OPENCV; return backendId == DNN_BACKEND_OPENCV;
} }

2
modules/dnn/test/test_tf_importer.cpp
View File

@ -558,8 +558,6 @@ TEST_P(Test_TensorFlow_layers, split)
TEST_P(Test_TensorFlow_layers, resize_nearest_neighbor) TEST_P(Test_TensorFlow_layers, resize_nearest_neighbor)
{ {
if (backend == DNN_BACKEND_INFERENCE_ENGINE && target != DNN_TARGET_MYRIAD)
throw SkipTestException("");
runTensorFlowNet("resize_nearest_neighbor"); runTensorFlowNet("resize_nearest_neighbor");
runTensorFlowNet("keras_upsampling2d"); runTensorFlowNet("keras_upsampling2d");
} }

2
modules/dnn/test/test_torch_importer.cpp
View File

@ -277,8 +277,6 @@ TEST_P(Test_Torch_nets, OpenFace_accuracy)
throw SkipTestException(""); throw SkipTestException("");
#endif #endif
checkBackend(); checkBackend();
if (backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_OPENCL_FP16)
throw SkipTestException("");
const string model = findDataFile("dnn/openface_nn4.small2.v1.t7", false); const string model = findDataFile("dnn/openface_nn4.small2.v1.t7", false);
Net net = readNetFromTorch(model); Net net = readNetFromTorch(model);