Commit 6a21eca7 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot

Merge pull request #1421 from ilya-lavrenov:ocl_bilateral

parents 747f7178 16357418
...@@ -333,13 +333,13 @@ PERF_TEST_P(BilateralFixture, Bilateral, ...@@ -333,13 +333,13 @@ PERF_TEST_P(BilateralFixture, Bilateral,
const Size_MatType_t params = GetParam(); const Size_MatType_t params = GetParam();
const Size srcSize = get<0>(params); const Size srcSize = get<0>(params);
const int type = get<1>(params), d = 7; const int type = get<1>(params), d = 7;
double sigmacolor = 50.0, sigmaspace = 50.0; const double sigmacolor = 50.0, sigmaspace = 50.0;
Mat src(srcSize, type), dst(srcSize, type); Mat src(srcSize, type), dst(srcSize, type);
declare.in(src, WARMUP_RNG).out(dst); declare.in(src, WARMUP_RNG).out(dst);
if (srcSize == OCL_SIZE_4000 && type == CV_8UC3) if (srcSize == OCL_SIZE_4000)
declare.time(8); declare.time(type == CV_8UC3 ? 8 : 4.5);
if (RUN_OCL_IMPL) if (RUN_OCL_IMPL)
{ {
...@@ -372,14 +372,16 @@ PERF_TEST_P(adaptiveBilateralFixture, adaptiveBilateral, ...@@ -372,14 +372,16 @@ PERF_TEST_P(adaptiveBilateralFixture, adaptiveBilateral,
const Size_MatType_t params = GetParam(); const Size_MatType_t params = GetParam();
const Size srcSize = get<0>(params); const Size srcSize = get<0>(params);
const int type = get<1>(params); const int type = get<1>(params);
double sigmaspace = 10.0; const double sigmaspace = 10.0;
Size ksize(9,9); Size ksize(9, 9);
Mat src(srcSize, type), dst(srcSize, type); Mat src(srcSize, type), dst(srcSize, type);
declare.in(src, WARMUP_RNG).out(dst); declare.in(src, WARMUP_RNG).out(dst);
if (srcSize == OCL_SIZE_4000) if (srcSize == OCL_SIZE_4000)
declare.time(15); declare.time(type == CV_8UC3 ? 46 : 28);
else if (srcSize == OCL_SIZE_2000)
declare.time(type == CV_8UC3 ? 11 : 7);
if (RUN_OCL_IMPL) if (RUN_OCL_IMPL)
{ {
...@@ -389,7 +391,7 @@ PERF_TEST_P(adaptiveBilateralFixture, adaptiveBilateral, ...@@ -389,7 +391,7 @@ PERF_TEST_P(adaptiveBilateralFixture, adaptiveBilateral,
oclDst.download(dst); oclDst.download(dst);
SANITY_CHECK(dst, 1.); SANITY_CHECK(dst, 1.0);
} }
else if (RUN_PLAIN_IMPL) else if (RUN_PLAIN_IMPL)
{ {
......
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