mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-18 08:05:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable ENet with Inference Engine backend on CPU

Browse Source
This commit is contained in:
Dmitry Kurtaev 2019-10-02 14:05:41 +03:00
parent ffea927ac2
commit e35fd463e7
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,8 @@ public:
{ {
if (backendId == DNN_BACKEND_INFERENCE_ENGINE) if (backendId == DNN_BACKEND_INFERENCE_ENGINE)
{ {
if (computeMaxIdx)
return false;
#ifdef HAVE_INF_ENGINE #ifdef HAVE_INF_ENGINE
if (kernel_size.size() == 3) if (kernel_size.size() == 3)
return preferableTarget == DNN_TARGET_CPU; return preferableTarget == DNN_TARGET_CPU;

6
modules/dnn/test/test_onnx_importer.cpp
View File

@ -86,8 +86,8 @@ TEST_P(Test_ONNX_layers, InstanceNorm)
TEST_P(Test_ONNX_layers, MaxPooling) TEST_P(Test_ONNX_layers, MaxPooling)
{ {
testONNXModels("maxpooling"); testONNXModels("maxpooling", npy, 0, 0, false, false);
testONNXModels("two_maxpooling"); testONNXModels("two_maxpooling", npy, 0, 0, false, false);
} }
TEST_P(Test_ONNX_layers, Convolution) TEST_P(Test_ONNX_layers, Convolution)
@ -212,7 +212,7 @@ TEST_P(Test_ONNX_layers, MaxPooling3D)
#endif #endif
if (target != DNN_TARGET_CPU) if (target != DNN_TARGET_CPU)
throw SkipTestException("Only CPU is supported"); throw SkipTestException("Only CPU is supported");
testONNXModels("max_pool3d"); testONNXModels("max_pool3d", npy, 0, 0, false, false);
} }
TEST_P(Test_ONNX_layers, AvePooling3D) TEST_P(Test_ONNX_layers, AvePooling3D)

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

@ -337,9 +337,15 @@ TEST_P(Test_Torch_nets, ENet_accuracy)
{ {
applyTestTag(target == DNN_TARGET_CPU ? "" : CV_TEST_TAG_MEMORY_512MB); applyTestTag(target == DNN_TARGET_CPU ? "" : CV_TEST_TAG_MEMORY_512MB);
checkBackend(); checkBackend();
if (backend == DNN_BACKEND_INFERENCE_ENGINE || if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
(backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)) throw SkipTestException("");
applyTestTag(target == DNN_TARGET_OPENCL ? CV_TEST_TAG_DNN_SKIP_IE_OPENCL : CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16); if (backend == DNN_BACKEND_INFERENCE_ENGINE && target != DNN_TARGET_CPU)
{
if (target == DNN_TARGET_OPENCL_FP16) applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16);
if (target == DNN_TARGET_OPENCL) applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_OPENCL);
if (target == DNN_TARGET_MYRIAD) applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD);
throw SkipTestException("");
}
Net net; Net net;
{ {