From 6b4becfd0397158a4686d0c13d6f98f4660f6301 Mon Sep 17 00:00:00 2001 From: Liubov Batanina Date: Mon, 11 Feb 2019 12:39:28 +0300 Subject: [PATCH] Enabled tests on IE backend --- modules/dnn/src/layers/normalize_bbox_layer.cpp | 2 +- modules/dnn/test/test_backends.cpp | 2 +- modules/dnn/test/test_torch_importer.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dnn/src/layers/normalize_bbox_layer.cpp b/modules/dnn/src/layers/normalize_bbox_layer.cpp index b5d98e0054..53a5f407d0 100644 --- a/modules/dnn/src/layers/normalize_bbox_layer.cpp +++ b/modules/dnn/src/layers/normalize_bbox_layer.cpp @@ -65,7 +65,7 @@ public: { if (backendId == DNN_BACKEND_INFERENCE_ENGINE) { - if (!(pnorm == 2 || pnorm == 1)) { + if (pnorm != 2) { return false; } return preferableTarget == DNN_TARGET_MYRIAD ? !acrossSpatial : startAxis == 1; diff --git a/modules/dnn/test/test_backends.cpp b/modules/dnn/test/test_backends.cpp index 1d97cfc088..66e80a1fe9 100644 --- a/modules/dnn/test/test_backends.cpp +++ b/modules/dnn/test/test_backends.cpp @@ -226,7 +226,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi_faster_4_stages) TEST_P(DNNTestNetwork, OpenFace) { #if defined(INF_ENGINE_RELEASE) -#if (INF_ENGINE_RELEASE < 2018030000 || INF_ENGINE_RELEASE == 2018050000) +#if (INF_ENGINE_RELEASE < 2018030000) if (backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_MYRIAD) throw SkipTestException(""); #elif INF_ENGINE_RELEASE < 2018040000 diff --git a/modules/dnn/test/test_torch_importer.cpp b/modules/dnn/test/test_torch_importer.cpp index 046bd65b86..99695ca031 100644 --- a/modules/dnn/test/test_torch_importer.cpp +++ b/modules/dnn/test/test_torch_importer.cpp @@ -272,12 +272,12 @@ class Test_Torch_nets : public DNNTestLayer {}; TEST_P(Test_Torch_nets, OpenFace_accuracy) { -#if defined(INF_ENGINE_RELEASE) && (INF_ENGINE_RELEASE < 2018030000 || INF_ENGINE_RELEASE == 2018050000) +#if defined(INF_ENGINE_RELEASE) && (INF_ENGINE_RELEASE < 2018030000) if (backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_MYRIAD) throw SkipTestException(""); #endif checkBackend(); - if (backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_OPENCL_FP16) + if (backend == DNN_BACKEND_INFERENCE_ENGINE && target == DNN_TARGET_OPENCL_FP16 && INF_ENGINE_RELEASE != 2018050000) throw SkipTestException(""); const string model = findDataFile("dnn/openface_nn4.small2.v1.t7", false);