mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2804 from ilya-lavrenov:tapi_perf

Browse Source
This commit is contained in:
Alexander Alekhin 2014-05-30 00:38:11 +04:00 committed by OpenCV Buildbot
commit 316e6a8f2b
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/core/perf/opencl/perf_arithm.cpp
View File

@ -738,6 +738,26 @@ CV_ENUM(NormType, NORM_INF, NORM_L1, NORM_L2)
typedef std::tr1::tuple<Size, MatType, NormType> NormParams; typedef std::tr1::tuple<Size, MatType, NormType> NormParams;
typedef TestBaseWithParam<NormParams> NormFixture; typedef TestBaseWithParam<NormParams> NormFixture;
OCL_PERF_TEST_P(NormFixture, Norm1Arg,
::testing::Combine(OCL_PERF_ENUM(OCL_SIZE_1, OCL_SIZE_2, OCL_SIZE_3),
OCL_TEST_TYPES_134, NormType::all()))
{
const NormParams params = GetParam();
const Size srcSize = get<0>(params);
const int type = get<1>(params);
const int normType = get<2>(params);
checkDeviceMaxMemoryAllocSize(srcSize, type);
UMat src1(srcSize, type);
double res;
declare.in(src1, WARMUP_RNG);
OCL_TEST_CYCLE() res = cv::norm(src1, normType);
SANITY_CHECK(res, 1e-5, ERROR_RELATIVE);
}
OCL_PERF_TEST_P(NormFixture, Norm, OCL_PERF_TEST_P(NormFixture, Norm,
::testing::Combine(OCL_PERF_ENUM(OCL_SIZE_1, OCL_SIZE_2, OCL_SIZE_3), ::testing::Combine(OCL_PERF_ENUM(OCL_SIZE_1, OCL_SIZE_2, OCL_SIZE_3),
OCL_TEST_TYPES_134, NormType::all())) OCL_TEST_TYPES_134, NormType::all()))
@ -910,6 +930,24 @@ OCL_PERF_TEST_P(NormalizeFixture, Normalize,
SANITY_CHECK(dst, 5e-2); SANITY_CHECK(dst, 5e-2);
} }
OCL_PERF_TEST_P(NormalizeFixture, NormalizeWithMask,
::testing::Combine(OCL_TEST_SIZES, OCL_PERF_ENUM(CV_8UC1, CV_32FC1),
NormalizeModes::all()))
{
const NormalizeParams params = GetParam();
const Size srcSize = get<0>(params);
const int type = get<1>(params), mode = get<2>(params);
checkDeviceMaxMemoryAllocSize(srcSize, type);
UMat src(srcSize, type), mask(srcSize, CV_8UC1), dst(srcSize, type);
declare.in(src, mask, WARMUP_RNG).out(dst);
OCL_TEST_CYCLE() cv::normalize(src, dst, 10, 110, mode, -1, mask);
SANITY_CHECK(dst, 5e-2);
}
///////////// ConvertScaleAbs //////////////////////// ///////////// ConvertScaleAbs ////////////////////////
typedef Size_MatType ConvertScaleAbsFixture; typedef Size_MatType ConvertScaleAbsFixture;