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
e8f9762e
Commit
e8f9762e
authored
Nov 12, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
matrix reduction
parent
fbf3de43
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
matrix_reductions.cu
modules/gpu/src/cuda/matrix_reductions.cu
+0
-0
matrix_reductions.cpp
modules/gpu/src/matrix_reductions.cpp
+0
-0
test_core.cpp
modules/gpu/test/test_core.cpp
+11
-3
No files found.
modules/gpu/src/cuda/matrix_reductions.cu
View file @
e8f9762e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
modules/gpu/src/matrix_reductions.cpp
View file @
e8f9762e
This diff is collapsed.
Click to expand it.
modules/gpu/test/test_core.cpp
View file @
e8f9762e
...
...
@@ -2982,7 +2982,7 @@ TEST_P(Sum, Sqr)
INSTANTIATE_TEST_CASE_P
(
GPU_Core
,
Sum
,
testing
::
Combine
(
ALL_DEVICES
,
DIFFERENT_SIZES
,
TYPES
(
CV_8U
,
CV_
32
F
,
1
,
4
),
TYPES
(
CV_8U
,
CV_
64
F
,
1
,
4
),
WHOLE_SUBMAT
));
////////////////////////////////////////////////////////////////////////////////
...
...
@@ -3351,7 +3351,14 @@ PARAM_TEST_CASE(Reduce, cv::gpu::DeviceInfo, cv::Size, MatDepth, Channels, Reduc
cv
::
gpu
::
setDevice
(
devInfo
.
deviceID
());
type
=
CV_MAKE_TYPE
(
depth
,
channels
);
dst_depth
=
(
reduceOp
==
CV_REDUCE_MAX
||
reduceOp
==
CV_REDUCE_MIN
)
?
depth
:
CV_32F
;
if
(
reduceOp
==
CV_REDUCE_MAX
||
reduceOp
==
CV_REDUCE_MIN
)
dst_depth
=
depth
;
else
if
(
reduceOp
==
CV_REDUCE_SUM
)
dst_depth
=
depth
==
CV_8U
?
CV_32S
:
depth
<
CV_64F
?
CV_32F
:
depth
;
else
dst_depth
=
depth
<
CV_32F
?
CV_32F
:
depth
;
dst_type
=
CV_MAKE_TYPE
(
dst_depth
,
channels
);
}
...
...
@@ -3392,7 +3399,8 @@ INSTANTIATE_TEST_CASE_P(GPU_Core, Reduce, testing::Combine(
testing
::
Values
(
MatDepth
(
CV_8U
),
MatDepth
(
CV_16U
),
MatDepth
(
CV_16S
),
MatDepth
(
CV_32F
)),
MatDepth
(
CV_32F
),
MatDepth
(
CV_64F
)),
ALL_CHANNELS
,
ALL_REDUCE_CODES
,
WHOLE_SUBMAT
));
...
...
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