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
4d721e36
Commit
4d721e36
authored
Dec 05, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10218 from catree:fix_cuda_integral
parents
552c3ba8
6d06fcb4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
test_reductions.cpp
modules/cudaarithm/test/test_reductions.cpp
+1
-1
integral.hpp
modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp
+1
-1
No files found.
modules/cudaarithm/test/test_reductions.cpp
View file @
4d721e36
...
@@ -1076,7 +1076,7 @@ CUDA_TEST_P(Integral, Accuracy)
...
@@ -1076,7 +1076,7 @@ CUDA_TEST_P(Integral, Accuracy)
INSTANTIATE_TEST_CASE_P
(
CUDA_Arithm
,
Integral
,
testing
::
Combine
(
INSTANTIATE_TEST_CASE_P
(
CUDA_Arithm
,
Integral
,
testing
::
Combine
(
ALL_DEVICES
,
ALL_DEVICES
,
testing
::
Values
(
cv
::
Size
(
128
,
128
),
cv
::
Size
(
113
,
113
),
cv
::
Size
(
768
,
1066
)),
testing
::
Values
(
cv
::
Size
(
1
6
,
16
),
cv
::
Size
(
1
28
,
128
),
cv
::
Size
(
113
,
113
),
cv
::
Size
(
768
,
1066
)),
WHOLE_SUBMAT
));
WHOLE_SUBMAT
));
///////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp
View file @
4d721e36
...
@@ -598,7 +598,7 @@ namespace integral_detail
...
@@ -598,7 +598,7 @@ namespace integral_detail
__host__
static
void
integral
(
const
GlobPtr
<
uchar
>&
src
,
const
GlobPtr
<
uint
>&
dst
,
int
rows
,
int
cols
,
cudaStream_t
stream
)
__host__
static
void
integral
(
const
GlobPtr
<
uchar
>&
src
,
const
GlobPtr
<
uint
>&
dst
,
int
rows
,
int
cols
,
cudaStream_t
stream
)
{
{
if
(
deviceSupports
(
FEATURE_SET_COMPUTE_30
)
if
(
deviceSupports
(
FEATURE_SET_COMPUTE_30
)
&&
(
cols
%
16
==
0
)
&&
(
cols
%
64
==
0
)
&&
reinterpret_cast
<
intptr_t
>
(
src
.
data
)
%
32
==
0
&&
reinterpret_cast
<
intptr_t
>
(
src
.
data
)
%
32
==
0
&&
reinterpret_cast
<
intptr_t
>
(
dst
.
data
)
%
32
==
0
)
&&
reinterpret_cast
<
intptr_t
>
(
dst
.
data
)
%
32
==
0
)
{
{
...
...
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