From 41eb91f5f1b3fb65901fec5d0dc65ddabbc5c94c Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Wed, 4 Apr 2012 10:56:17 +0000 Subject: [PATCH] Updated performance tests sanity data; fixed some tests --- modules/core/perf/perf_convertTo.cpp | 2 +- modules/core/perf/perf_merge.cpp | 2 +- modules/core/perf/perf_split.cpp | 2 +- modules/imgproc/perf/perf_blur.cpp | 5 +++++ modules/imgproc/perf/perf_cornerHarris.cpp | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/core/perf/perf_convertTo.cpp b/modules/core/perf/perf_convertTo.cpp index 6eaed4a..ef0bf65 100644 --- a/modules/core/perf/perf_convertTo.cpp +++ b/modules/core/perf/perf_convertTo.cpp @@ -32,5 +32,5 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo, TEST_CYCLE() src.convertTo(dst, depthDst, alpha); - SANITY_CHECK(dst); + SANITY_CHECK(dst, 1e-12); } diff --git a/modules/core/perf/perf_merge.cpp b/modules/core/perf/perf_merge.cpp index 576ad23..302b9b2 100644 --- a/modules/core/perf/perf_merge.cpp +++ b/modules/core/perf/perf_merge.cpp @@ -32,5 +32,5 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge, Mat dst; TEST_CYCLE() merge( (vector &)mv, dst ); - SANITY_CHECK(dst); + SANITY_CHECK(dst, 1e-12); } \ No newline at end of file diff --git a/modules/core/perf/perf_split.cpp b/modules/core/perf/perf_split.cpp index db75165..ea4e5ab 100644 --- a/modules/core/perf/perf_split.cpp +++ b/modules/core/perf/perf_split.cpp @@ -29,5 +29,5 @@ PERF_TEST_P( Size_Depth_Channels, split, TEST_CYCLE() split(m, (vector&)mv); - SANITY_CHECK(mv); + SANITY_CHECK(mv, 1e-12); } diff --git a/modules/imgproc/perf/perf_blur.cpp b/modules/imgproc/perf/perf_blur.cpp index 58992fe..5c27747 100644 --- a/modules/imgproc/perf/perf_blur.cpp +++ b/modules/imgproc/perf/perf_blur.cpp @@ -1,4 +1,5 @@ #include "perf_precomp.hpp" +#include "opencv2/core/internal.hpp" using namespace std; using namespace cv; @@ -62,7 +63,11 @@ PERF_TEST_P(Size_MatType_BorderType3x3, gaussianBlur3x3, TEST_CYCLE() GaussianBlur(src, dst, Size(3,3), 0, 0, btype); +#if CV_SSE2 + SANITY_CHECK(dst, 1); +#else SANITY_CHECK(dst); +#endif } PERF_TEST_P(Size_MatType_BorderType3x3, blur3x3, diff --git a/modules/imgproc/perf/perf_cornerHarris.cpp b/modules/imgproc/perf/perf_cornerHarris.cpp index c7a30b5..b3dc760 100644 --- a/modules/imgproc/perf/perf_cornerHarris.cpp +++ b/modules/imgproc/perf/perf_cornerHarris.cpp @@ -35,5 +35,5 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_k_BorderType, cornerHarris, TEST_CYCLE() cornerHarris(src, dst, blockSize, apertureSize, k, borderType); - SANITY_CHECK(dst); + SANITY_CHECK(dst, 2e-6); } \ No newline at end of file -- 2.7.4