ocl: compare with scalar

This commit is contained in:
Alexander Alekhin
2014-03-13 20:36:23 +04:00
parent c72a0a1295
commit 755ca4b7cf
6 changed files with 159 additions and 55 deletions

View File

@@ -540,7 +540,7 @@ typedef TestBaseWithParam<CompareParams> CompareFixture;
OCL_PERF_TEST_P(CompareFixture, Compare,
::testing::Combine(OCL_TEST_SIZES,
OCL_TEST_TYPES, CmpCode::all()))
OCL_TEST_TYPES_134, CmpCode::all()))
{
const CompareParams params = GetParam();
const Size srcSize = get<0>(params);
@@ -549,7 +549,7 @@ OCL_PERF_TEST_P(CompareFixture, Compare,
checkDeviceMaxMemoryAllocSize(srcSize, type);
UMat src1(srcSize, type), src2(srcSize, type), dst(srcSize, CV_8UC1);
UMat src1(srcSize, type), src2(srcSize, type), dst(srcSize, CV_8UC(CV_MAT_CN(type)));
declare.in(src1, src2, WARMUP_RNG).out(dst);
OCL_TEST_CYCLE() cv::compare(src1, src2, dst, cmpCode);
@@ -557,6 +557,25 @@ OCL_PERF_TEST_P(CompareFixture, Compare,
SANITY_CHECK(dst);
}
OCL_PERF_TEST_P(CompareFixture, CompareScalar,
::testing::Combine(OCL_TEST_SIZES,
OCL_TEST_TYPES_134, CmpCode::all()))
{
const CompareParams params = GetParam();
const Size srcSize = get<0>(params);
const int type = get<1>(params);
const int cmpCode = get<2>(params);
checkDeviceMaxMemoryAllocSize(srcSize, type);
UMat src1(srcSize, type), dst(srcSize, CV_8UC(CV_MAT_CN(type)));
declare.in(src1, WARMUP_RNG).out(dst);
OCL_TEST_CYCLE() cv::compare(src1, 32, dst, cmpCode);
SANITY_CHECK(dst);
}
///////////// pow ////////////////////////
typedef Size_MatType PowFixture;