Commit 79eba54a authored by Alexander Alekhin's avatar Alexander Alekhin

some fixes in perf tests

parent ccbceb56
...@@ -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();
......
...@@ -876,7 +876,9 @@ void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype) ...@@ -876,7 +876,9 @@ 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())
{
if (wtype == WARMUP_RNG || wtype == WARMUP_WRITE)
{ {
int depth = a.depth(); int depth = a.depth();
if (depth == CV_8U) if (depth == CV_8U)
...@@ -891,7 +893,7 @@ void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype) ...@@ -891,7 +893,7 @@ void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype)
cv::randu(a, -4096, 4096); cv::randu(a, -4096, 4096);
else else
CV_Error(cv::Error::StsUnsupportedFormat, "Unsupported format"); 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment