Merge pull request #10036 from alalek:fix_ocl4dnn_invalid_kernel

48ed769b · Alexander Alekhin · bffe254a · 97181a90 · 48ed769b
Commit 48ed769b authored Nov 07, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

ocl4dnn_conv_spatial.cpp modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp +2 -0

No files found.
--- 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());
 }