From b14c314fc3a18bd204364c7a4c5dec8fe218bdf0 Mon Sep 17 00:00:00 2001 From: Alexander Karsakov Date: Wed, 19 Mar 2014 17:33:13 +0400 Subject: [PATCH] Fixed incorrect thread synchronizations --- modules/objdetect/src/opencl/objdetect_hog.cl | 3 +-- modules/objdetect/test/opencl/test_hogdetector.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/objdetect/src/opencl/objdetect_hog.cl b/modules/objdetect/src/opencl/objdetect_hog.cl index 5c71aa1..704dec4 100644 --- a/modules/objdetect/src/opencl/objdetect_hog.cl +++ b/modules/objdetect/src/opencl/objdetect_hog.cl @@ -141,9 +141,8 @@ __kernel void compute_hists_lut_kernel( final_hist[(cell_x * 2 + cell_y) * cnbins + bin_id] = hist_[0] + hist_[1] + hist_[2]; } -#ifdef CPU + barrier(CLK_LOCAL_MEM_FENCE); -#endif int tid = (cell_y * CELLS_PER_BLOCK_Y + cell_x) * 12 + cell_thread_x; if ((tid < cblock_hist_size) && (gid < blocks_total)) diff --git a/modules/objdetect/test/opencl/test_hogdetector.cpp b/modules/objdetect/test/opencl/test_hogdetector.cpp index 8568352..b3ef6b4 100644 --- a/modules/objdetect/test/opencl/test_hogdetector.cpp +++ b/modules/objdetect/test/opencl/test_hogdetector.cpp @@ -110,7 +110,7 @@ OCL_TEST_P(HOG, Detect) OCL_OFF(hog.detectMultiScale(img, cpu_found, 0, Size(8, 8), Size(0, 0), 1.05, 6)); OCL_ON(hog.detectMultiScale(uimg, gpu_found, 0, Size(8, 8), Size(0, 0), 1.05, 6)); - EXPECT_LT(checkRectSimilarity(img.size(), cpu_found, gpu_found), 1.0); + EXPECT_LT(checkRectSimilarity(img.size(), cpu_found, gpu_found), 0.05); } INSTANTIATE_TEST_CASE_P(OCL_ObjDetect, HOG, testing::Combine( -- 2.7.4