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
79eba54a
Commit
79eba54a
authored
Feb 12, 2014
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some fixes in perf tests
parent
ccbceb56
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
17 deletions
+19
-17
perf_channels.cpp
modules/core/perf/opencl/perf_channels.cpp
+1
-1
ts_perf.cpp
modules/ts/src/ts_perf.cpp
+18
-16
No files found.
modules/core/perf/opencl/perf_channels.cpp
View file @
79eba54a
...
@@ -85,7 +85,7 @@ OCL_PERF_TEST_P(MergeFixture, Merge,
...
@@ -85,7 +85,7 @@ OCL_PERF_TEST_P(MergeFixture, Merge,
typedef
MergeParams
SplitParams
;
typedef
MergeParams
SplitParams
;
typedef
TestBaseWithParam
<
SplitParams
>
SplitFixture
;
typedef
TestBaseWithParam
<
SplitParams
>
SplitFixture
;
OCL_PERF_TEST_P
(
SplitFixture
,
DISABLED_
Split
,
OCL_PERF_TEST_P
(
SplitFixture
,
Split
,
::
testing
::
Combine
(
OCL_TEST_SIZES
,
OCL_PERF_ENUM
(
CV_8U
,
CV_32F
),
Values
(
2
,
3
)))
::
testing
::
Combine
(
OCL_TEST_SIZES
,
OCL_PERF_ENUM
(
CV_8U
,
CV_32F
),
Values
(
2
,
3
)))
{
{
const
SplitParams
params
=
GetParam
();
const
SplitParams
params
=
GetParam
();
...
...
modules/ts/src/ts_perf.cpp
View file @
79eba54a
...
@@ -876,22 +876,24 @@ void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype)
...
@@ -876,22 +876,24 @@ void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype)
{
{
if
(
a
.
empty
())
if
(
a
.
empty
())
return
;
return
;
else
if
(
a
.
isUMat
()
&&
wtype
!=
WARMUP_READ
)
else
if
(
a
.
isUMat
())
{
{
int
depth
=
a
.
depth
();
if
(
wtype
==
WARMUP_RNG
||
wtype
==
WARMUP_WRITE
)
if
(
depth
==
CV_8U
)
{
cv
::
randu
(
a
,
0
,
256
);
int
depth
=
a
.
depth
();
else
if
(
depth
==
CV_8S
)
if
(
depth
==
CV_8U
)
cv
::
randu
(
a
,
-
128
,
128
);
cv
::
randu
(
a
,
0
,
256
);
else
if
(
depth
==
CV_16U
)
else
if
(
depth
==
CV_8S
)
cv
::
randu
(
a
,
0
,
1024
);
cv
::
randu
(
a
,
-
128
,
128
);
else
if
(
depth
==
CV_32F
||
depth
==
CV_64F
)
else
if
(
depth
==
CV_16U
)
cv
::
randu
(
a
,
-
1.0
,
1.0
);
cv
::
randu
(
a
,
0
,
1024
);
else
if
(
depth
==
CV_16S
||
depth
==
CV_32S
)
else
if
(
depth
==
CV_32F
||
depth
==
CV_64F
)
cv
::
randu
(
a
,
-
4096
,
4096
);
cv
::
randu
(
a
,
-
1.0
,
1.0
);
else
else
if
(
depth
==
CV_16S
||
depth
==
CV_32S
)
CV_Error
(
cv
::
Error
::
StsUnsupportedFormat
,
"Unsupported format"
);
cv
::
randu
(
a
,
-
4096
,
4096
);
else
CV_Error
(
cv
::
Error
::
StsUnsupportedFormat
,
"Unsupported format"
);
}
return
;
return
;
}
}
else
if
(
a
.
kind
()
!=
cv
::
_InputArray
::
STD_VECTOR_MAT
&&
a
.
kind
()
!=
cv
::
_InputArray
::
STD_VECTOR_VECTOR
)
else
if
(
a
.
kind
()
!=
cv
::
_InputArray
::
STD_VECTOR_MAT
&&
a
.
kind
()
!=
cv
::
_InputArray
::
STD_VECTOR_VECTOR
)
...
...
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