Skip to content

O
opencv
Commit e860ed76 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #5714 from ajbernal:OCL_HOG_Fix

parents 7ddc2cc0 5c868313
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/objdetect/src/hog.cpp
View file @ e860ed76
...@@ -1224,7 +1224,7 @@ static bool ocl_normalize_hists(int nbins, int block_stride_x, int block_stride_ ...@@ -1224,7 +1224,7 @@ static bool ocl_normalize_hists(int nbins, int block_stride_x, int block_stride_
} }
else else
{ {
k.create("normalize_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("normalize_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)
...@@ -1651,7 +1651,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y ...@@ -1651,7 +1651,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y
{ {
case 180: case 180:
nthreads = 180; nthreads = 180;
k.create("classify_hists_180_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("classify_hists_180_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)
...@@ -1667,7 +1667,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y ...@@ -1667,7 +1667,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y
case 252: case 252:
nthreads = 256; nthreads = 256;
k.create("classify_hists_252_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("classify_hists_252_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)
...@@ -1683,7 +1683,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y ...@@ -1683,7 +1683,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y
default: default:
nthreads = 256; nthreads = 256;
k.create("classify_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("classify_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment