From 8877066846592a2bb32f4ac14c778fcad0e380f9 Mon Sep 17 00:00:00 2001 From: Anna Kogan Date: Wed, 28 Nov 2012 14:13:24 +0400 Subject: [PATCH] increased time-limits --- modules/core/perf/perf_arithm.cpp | 1 + modules/features2d/perf/perf_batchDistance.cpp | 1 + modules/imgproc/perf/perf_cvt_color.cpp | 2 ++ modules/imgproc/perf/perf_houghLines.cpp | 2 +- modules/imgproc/perf/perf_integral.cpp | 2 ++ modules/imgproc/perf/perf_resize.cpp | 1 + modules/imgproc/perf/perf_threshold.cpp | 1 + modules/imgproc/perf/perf_warp.cpp | 1 + modules/photo/perf/perf_inpaint.cpp | 2 +- modules/video/perf/perf_optflowpyrlk.cpp | 1 + 10 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/core/perf/perf_arithm.cpp b/modules/core/perf/perf_arithm.cpp index c7f4978..962a9e0 100644 --- a/modules/core/perf/perf_arithm.cpp +++ b/modules/core/perf/perf_arithm.cpp @@ -123,6 +123,7 @@ PERF_TEST_P(Size_MatType, add, TYPICAL_MATS_CORE_ARITHM) cv::Mat c = Mat(sz, type); declare.in(a, b, WARMUP_RNG).out(c); + declare.time(50); if (CV_MAT_DEPTH(type) == CV_32S) { diff --git a/modules/features2d/perf/perf_batchDistance.cpp b/modules/features2d/perf/perf_batchDistance.cpp index cf58be4..cf0e2d3 100644 --- a/modules/features2d/perf/perf_batchDistance.cpp +++ b/modules/features2d/perf/perf_batchDistance.cpp @@ -92,6 +92,7 @@ PERF_TEST_P(Source_CrossCheck, batchDistance_L2, generateData(queryDescriptors, trainDescriptors, sourceType); + declare.time(50); TEST_CYCLE() { batchDistance(queryDescriptors, trainDescriptors, dist, CV_32F, (isCrossCheck) ? ndix : noArray(), diff --git a/modules/imgproc/perf/perf_cvt_color.cpp b/modules/imgproc/perf/perf_cvt_color.cpp index 42914fb..67cec0f 100644 --- a/modules/imgproc/perf/perf_cvt_color.cpp +++ b/modules/imgproc/perf/perf_cvt_color.cpp @@ -244,6 +244,7 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u, Mat src(sz, CV_8UC(ch.scn)); Mat dst(sz, CV_8UC(ch.dcn)); + declare.time(100); declare.in(src, WARMUP_RNG).out(dst); TEST_CYCLE() cvtColor(src, dst, mode, ch.dcn); @@ -268,6 +269,7 @@ PERF_TEST_P(Size_CvtMode2, cvtColorYUV420, Mat src(sz.height + sz.height / 2, sz.width, CV_8UC(ch.scn)); Mat dst(sz, CV_8UC(ch.dcn)); + declare.time(100); declare.in(src, WARMUP_RNG).out(dst); TEST_CYCLE() cvtColor(src, dst, mode, ch.dcn); diff --git a/modules/imgproc/perf/perf_houghLines.cpp b/modules/imgproc/perf/perf_houghLines.cpp index 055c575..c032c35 100644 --- a/modules/imgproc/perf/perf_houghLines.cpp +++ b/modules/imgproc/perf/perf_houghLines.cpp @@ -32,7 +32,7 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines, Canny(image, image, 0, 0); Mat lines; - declare.time(7); + declare.time(40); TEST_CYCLE() HoughLines(image, lines, rhoStep, thetaStep, threshold); diff --git a/modules/imgproc/perf/perf_integral.cpp b/modules/imgproc/perf/perf_integral.cpp index 9a6b7ad..2760d7a 100644 --- a/modules/imgproc/perf/perf_integral.cpp +++ b/modules/imgproc/perf/perf_integral.cpp @@ -48,6 +48,7 @@ PERF_TEST_P(Size_MatType_OutMatDepth, integral_sqsum, Mat sqsum(sz, sdepth); declare.in(src, WARMUP_RNG).out(sum, sqsum); + declare.time(100); TEST_CYCLE() integral(src, sum, sqsum, sdepth); @@ -73,6 +74,7 @@ PERF_TEST_P( Size_MatType_OutMatDepth, integral_sqsum_tilted, Mat tilted(sz, sdepth); declare.in(src, WARMUP_RNG).out(sum, sqsum, tilted); + declare.time(100); TEST_CYCLE() integral(src, sum, sqsum, tilted, sdepth); diff --git a/modules/imgproc/perf/perf_resize.cpp b/modules/imgproc/perf/perf_resize.cpp index 4db5e49..4758347 100644 --- a/modules/imgproc/perf/perf_resize.cpp +++ b/modules/imgproc/perf/perf_resize.cpp @@ -106,6 +106,7 @@ PERF_TEST_P(MatInfo_Size_Scale_Area, ResizeArea, cv::Mat dst(to, matType); declare.in(src, WARMUP_RNG).out(dst); + declare.time(100); TEST_CYCLE() resize(src, dst, dst.size(), 0, 0, INTER_AREA); diff --git a/modules/imgproc/perf/perf_threshold.cpp b/modules/imgproc/perf/perf_threshold.cpp index f80fb65..65c13a0 100644 --- a/modules/imgproc/perf/perf_threshold.cpp +++ b/modules/imgproc/perf/perf_threshold.cpp @@ -31,6 +31,7 @@ PERF_TEST_P(Size_MatType_ThreshType, threshold, double maxval = theRNG().uniform(1, 254); declare.in(src, WARMUP_RNG).out(dst); + declare.time(100); TEST_CYCLE() threshold(src, dst, thresh, maxval, threshType); diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp index b84e7ca..925ea94 100644 --- a/modules/imgproc/perf/perf_warp.cpp +++ b/modules/imgproc/perf/perf_warp.cpp @@ -133,6 +133,7 @@ PERF_TEST_P( TestWarpPerspectiveNear_t, WarpPerspectiveNear, Mat dst(size, type); declare.in(src).out(dst); + declare.time(100); TEST_CYCLE() { diff --git a/modules/photo/perf/perf_inpaint.cpp b/modules/photo/perf/perf_inpaint.cpp index 6f039b4..ea23bb4 100644 --- a/modules/photo/perf/perf_inpaint.cpp +++ b/modules/photo/perf/perf_inpaint.cpp @@ -29,7 +29,7 @@ PERF_TEST_P(InpaintArea_InpaintingMethod, inpaint, Rect inpaintArea(src.cols/3, src.rows/3, sz.width, sz.height); mask(inpaintArea).setTo(255); - declare.in(src, mask).out(result).time(30); + declare.in(src, mask).out(result).time(120); TEST_CYCLE() inpaint(src, mask, result, 10.0, inpaintingMethod); diff --git a/modules/video/perf/perf_optflowpyrlk.cpp b/modules/video/perf/perf_optflowpyrlk.cpp index 0ac9efe..1e5cfc2 100644 --- a/modules/video/perf/perf_optflowpyrlk.cpp +++ b/modules/video/perf/perf_optflowpyrlk.cpp @@ -163,6 +163,7 @@ PERF_TEST_P(Path_Idx_Cn_NPoints_WSize_Deriv, OpticalFlowPyrLK_self, testing::Com maxLevel = buildOpticalFlowPyramid(frame2, pyramid2, Size(winSize, winSize), maxLevel, withDerivatives); declare.in(pyramid1, pyramid2, inPoints).out(outPoints); + declare.time(400); TEST_CYCLE() { -- 2.7.4