From e9e3af0aaa18b93ad885890de41f6c35e8852b4c Mon Sep 17 00:00:00 2001 From: Liubov Batanina Date: Fri, 10 Jan 2020 11:22:19 +0300 Subject: [PATCH] Add global pool by axis test --- modules/dnn/src/layers/slice_layer.cpp | 7 +++---- modules/dnn/test/test_tf_importer.cpp | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/dnn/src/layers/slice_layer.cpp b/modules/dnn/src/layers/slice_layer.cpp index d7cafd7f93..b29833c5bb 100644 --- a/modules/dnn/src/layers/slice_layer.cpp +++ b/modules/dnn/src/layers/slice_layer.cpp @@ -114,10 +114,9 @@ public: virtual bool supportBackend(int backendId) CV_OVERRIDE { return backendId == DNN_BACKEND_OPENCV || - ((backendId == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 || backendId == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH) && -#ifdef HAVE_INF_ENGINE - INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2019R1) && -#endif + (backendId == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && sliceRanges.size() == 1) || + (backendId == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 && + sliceRanges.size() == 1 && sliceRanges[0].size() == 4); } diff --git a/modules/dnn/test/test_tf_importer.cpp b/modules/dnn/test/test_tf_importer.cpp index 8826fa09ff..ecfc1635e0 100644 --- a/modules/dnn/test/test_tf_importer.cpp +++ b/modules/dnn/test/test_tf_importer.cpp @@ -121,6 +121,13 @@ public: } }; +TEST_P(Test_TensorFlow_layers, reduce_mean) +{ + if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019) + applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER); + runTensorFlowNet("global_pool_by_axis"); +} + TEST_P(Test_TensorFlow_layers, conv) { runTensorFlowNet("single_conv");