From 4e21f4271460508c070af1ff6b27d4de62664af5 Mon Sep 17 00:00:00 2001 From: Anna Kogan Date: Wed, 28 Nov 2012 17:36:19 +0400 Subject: [PATCH] increased time-limits --- modules/calib3d/perf/perf_pnp.cpp | 1 + modules/core/perf/perf_bitwise.cpp | 4 ++++ modules/core/perf/perf_dot.cpp | 1 + modules/core/perf/perf_norm.cpp | 1 + modules/core/perf/perf_reduce.cpp | 2 ++ modules/features2d/perf/perf_batchDistance.cpp | 1 + 6 files changed, 10 insertions(+) diff --git a/modules/calib3d/perf/perf_pnp.cpp b/modules/calib3d/perf/perf_pnp.cpp index fa8f5808db..00a7c7e852 100644 --- a/modules/calib3d/perf/perf_pnp.cpp +++ b/modules/calib3d/perf/perf_pnp.cpp @@ -86,6 +86,7 @@ PERF_TEST(PointsNum_Algo, solveP3P) add(points2d, noise, points2d); declare.in(points3d, points2d); + declare.time(100); TEST_CYCLE_N(1000) { diff --git a/modules/core/perf/perf_bitwise.cpp b/modules/core/perf/perf_bitwise.cpp index 76354f45c3..d31e019703 100644 --- a/modules/core/perf/perf_bitwise.cpp +++ b/modules/core/perf/perf_bitwise.cpp @@ -19,6 +19,7 @@ PERF_TEST_P(Size_MatType, bitwise_not, TYPICAL_MATS_BITW_ARITHM) cv::Mat c = Mat(sz, type); declare.in(a, WARMUP_RNG).out(c); + declare.time(100); TEST_CYCLE() cv::bitwise_not(a, c); @@ -34,6 +35,7 @@ PERF_TEST_P(Size_MatType, bitwise_and, TYPICAL_MATS_BITW_ARITHM) cv::Mat c = Mat(sz, type); declare.in(a, b, WARMUP_RNG).out(c); + declare.time(100); TEST_CYCLE() bitwise_and(a, b, c); @@ -49,6 +51,7 @@ PERF_TEST_P(Size_MatType, bitwise_or, TYPICAL_MATS_BITW_ARITHM) cv::Mat c = Mat(sz, type); declare.in(a, b, WARMUP_RNG).out(c); + declare.time(100); TEST_CYCLE() bitwise_or(a, b, c); @@ -64,6 +67,7 @@ PERF_TEST_P(Size_MatType, bitwise_xor, TYPICAL_MATS_BITW_ARITHM) cv::Mat c = Mat(sz, type); declare.in(a, b, WARMUP_RNG).out(c); + declare.time(100); TEST_CYCLE() bitwise_xor(a, b, c); diff --git a/modules/core/perf/perf_dot.cpp b/modules/core/perf/perf_dot.cpp index 8de1a7cba1..40dc9a4d5e 100644 --- a/modules/core/perf/perf_dot.cpp +++ b/modules/core/perf/perf_dot.cpp @@ -21,6 +21,7 @@ PERF_TEST_P( MatType_Length, dot, Mat b(size, size, type); declare.in(a, b, WARMUP_RNG); + declare.time(100); double product; diff --git a/modules/core/perf/perf_norm.cpp b/modules/core/perf/perf_norm.cpp index a9428ee9d0..4fb498eb30 100644 --- a/modules/core/perf/perf_norm.cpp +++ b/modules/core/perf/perf_norm.cpp @@ -150,6 +150,7 @@ PERF_TEST_P(Size_MatType_NormType, normalize_mask, if(normType==NORM_L2) alpha = (double)src.total()/10; declare.in(src, WARMUP_RNG).in(mask).out(dst); + declare.time(100); TEST_CYCLE() normalize(src, dst, alpha, 0., normType, -1, mask); diff --git a/modules/core/perf/perf_reduce.cpp b/modules/core/perf/perf_reduce.cpp index 77172770bb..81cdb5db57 100644 --- a/modules/core/perf/perf_reduce.cpp +++ b/modules/core/perf/perf_reduce.cpp @@ -32,6 +32,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceR, Mat vec(1, sz.width, ddepth < 0 ? matType : ddepth); declare.in(src, WARMUP_RNG).out(vec); + declare.time(100); TEST_CYCLE() reduce(src, vec, 0, reduceOp, ddepth); @@ -58,6 +59,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceC, Mat vec(sz.height, 1, ddepth < 0 ? matType : ddepth); declare.in(src, WARMUP_RNG).out(vec); + declare.time(100); TEST_CYCLE() reduce(src, vec, 1, reduceOp, ddepth); diff --git a/modules/features2d/perf/perf_batchDistance.cpp b/modules/features2d/perf/perf_batchDistance.cpp index cf0e2d392b..157b59fb4a 100644 --- a/modules/features2d/perf/perf_batchDistance.cpp +++ b/modules/features2d/perf/perf_batchDistance.cpp @@ -119,6 +119,7 @@ PERF_TEST_P(Norm_CrossCheck, batchDistance_32F, Mat ndix; generateData(queryDescriptors, trainDescriptors, CV_32F); + declare.time(100); TEST_CYCLE() {