Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward

7fe07279 · Alexander Alekhin · 529d3861 · b6255ab9 · 7fe07279
Commit 7fe07279 authored Jul 09, 2018 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ocl4dnn_pool.cpp modules/dnn/src/ocl4dnn/src/ocl4dnn_pool.cpp +3 -2

No files found.
--- a/modules/dnn/src/ocl4dnn/src/ocl4dnn_pool.cpp
+++ b/modules/dnn/src/ocl4dnn/src/ocl4dnn_pool.cpp
@@ -132,9 +132,10 @@ bool OCL4DNNPool<Dtype>::Forward(const UMat& bottom,
                width_,
                pooled_height_,
                pooled_width_,
-                ocl::KernelArg::PtrWriteOnly(top),
-                ocl::KernelArg::PtrWriteOnly(top_mask)
+                ocl::KernelArg::PtrWriteOnly(top)
            );
+            if (computeMaxIdx)
+                oclk_max_pool_forward.set(8, ocl::KernelArg::PtrWriteOnly(top_mask));  // TODO remove magic number. Extend cv::ocl::Kernel API

            ret = oclk_max_pool_forward.run(1, global, local, false);
        }