Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
632452cd
Commit
632452cd
authored
Oct 28, 2013
by
yao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the mismatch running on cpu devices
parent
dd0fa63c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
2 deletions
+24
-2
brute_force_match.cl
modules/ocl/src/opencl/brute_force_match.cl
+24
-2
No files found.
modules/ocl/src/opencl/brute_force_match.cl
View file @
632452cd
...
...
@@ -113,6 +113,24 @@ result_type reduce_block(
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
(
__local
value_type
*s_query,
__local
value_type
*s_train,
...
...
@@ -275,11 +293,13 @@ __kernel void BruteForceMatch_Match(
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
)
;
}
result
=
DIST_RES
(
result
)
;
const
int
trainIdx
=
t
*
BLOCK_SIZE
+
lidx
;
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
)
;
result
+=
reduce_block
(
s_query,
s_train,
lidx,
lidy
)
;
result
+=
reduce_block
_match
(
s_query,
s_train,
lidx,
lidy
)
;
barrier
(
CLK_LOCAL_MEM_FENCE
)
;
}
result
=
DIST_RES
(
result
)
;
const
int
trainIdx
=
t
*
BLOCK_SIZE
+
lidx
;
if
(
queryIdx
<
query_rows
&&
trainIdx
<
train_rows
/*&&
mask
(
queryIdx,
trainIdx
)
*/
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment