generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix the mismatch running on cpu devices

Browse Source
This commit is contained in:
yao 2013-10-28 16:32:46 +08:00
parent dd0fa63ca8
commit 632452cdd8
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/ocl/src/opencl/brute_force_match.cl
View File

@ -113,6 +113,24 @@ result_type reduce_block(
return DIST_RES(result); return DIST_RES(result);
} }
result_type reduce_block_match(
__local value_type *s_query,
__local value_type *s_train,
int lidx,
int lidy
)
{
result_type result = 0;
#pragma unroll
for (int j = 0 ; j < BLOCK_SIZE ; j++)
{
result += DIST(
s_query[lidy * BLOCK_SIZE + j],
s_train[j * BLOCK_SIZE + lidx]);
}
return (result);
}
result_type reduce_multi_block( result_type reduce_multi_block(
__local value_type *s_query, __local value_type *s_query,
__local value_type *s_train, __local value_type *s_train,
@ -275,11 +293,13 @@ __kernel void BruteForceMatch_Match(
barrier(CLK_LOCAL_MEM_FENCE); barrier(CLK_LOCAL_MEM_FENCE);
result += reduce_block(s_query, s_train, lidx, lidy); result += reduce_block_match(s_query, s_train, lidx, lidy);
barrier(CLK_LOCAL_MEM_FENCE); barrier(CLK_LOCAL_MEM_FENCE);
} }
result = DIST_RES(result);
const int trainIdx = t * BLOCK_SIZE + lidx; const int trainIdx = t * BLOCK_SIZE + lidx;
if (queryIdx < query_rows && trainIdx < train_rows && result < myBestDistance /*&& mask(queryIdx, trainIdx)*/) if (queryIdx < query_rows && trainIdx < train_rows && result < myBestDistance /*&& mask(queryIdx, trainIdx)*/)
@ -636,11 +656,13 @@ __kernel void BruteForceMatch_knnMatch(
barrier(CLK_LOCAL_MEM_FENCE); barrier(CLK_LOCAL_MEM_FENCE);
result += reduce_block(s_query, s_train, lidx, lidy); result += reduce_block_match(s_query, s_train, lidx, lidy);
barrier(CLK_LOCAL_MEM_FENCE); barrier(CLK_LOCAL_MEM_FENCE);
} }
result = DIST_RES(result);
const int trainIdx = t * BLOCK_SIZE + lidx; const int trainIdx = t * BLOCK_SIZE + lidx;
if (queryIdx < query_rows && trainIdx < train_rows /*&& mask(queryIdx, trainIdx)*/) if (queryIdx < query_rows && trainIdx < train_rows /*&& mask(queryIdx, trainIdx)*/)