Merge pull request opencv#10036 from alalek:fix_ocl4dnn_invalid_kernel

alalek · alalek · commit 48ed769b1869 · 2017-11-07T19:17:21.000Z
diff --git a/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp b/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
@@ -379,6 +379,8 @@ bool OCL4DNNConvSpatial<Dtype>::Forward(const UMat& bottom,
 {
     num_ = numImages;
     prepareKernel(bottom, top, weight, bias, numImages);
+    if (bestKernelConfig.empty())
+        return false;
     return convolve(bottom, top, weight, bias, numImages, bestKernelConfig, cv::ocl::Queue::getDefault());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,8 @@ bool OCL4DNNConvSpatial<Dtype>::Forward(const UMat& bottom,`
`379`	`379`	`{`
`380`	`380`	`num_ = numImages;`
`381`	`381`	`prepareKernel(bottom, top, weight, bias, numImages);`
	`382`	`+ if (bestKernelConfig.empty())`
	`383`	`+ return false;`
`382`	`384`	`return convolve(bottom, top, weight, bias, numImages, bestKernelConfig, cv::ocl::Queue::getDefault());`
`383`	`385`	`}`
`384`	`386`