Merge pull request #11867 from dkurt:dnn_ie_layers
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 6 Jul 2018 13:13:20 +0000 (13:13 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 6 Jul 2018 13:13:20 +0000 (13:13 +0000)
1  2 
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_tf_importer.cpp

Simple merge
Simple merge
@@@ -400,14 -438,18 +438,19 @@@ TEST_P(Test_TensorFlow_layers, split
      runTensorFlowNet("split_equals");
  }
  
- TEST(Test_TensorFlow, 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("keras_upsampling2d");
  }
  
- TEST(Test_TensorFlow, slice)
+ TEST_P(Test_TensorFlow_layers, slice)
  {
+     if (backend == DNN_BACKEND_INFERENCE_ENGINE &&
+         (target == DNN_TARGET_OPENCL || target == DNN_TARGET_OPENCL_FP16))
+         throw SkipTestException("");
      runTensorFlowNet("slice_4d");
  }