potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

ts: refactor OpenCV tests

Browse Source 
- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
This commit is contained in:
Alexander Alekhin
2017-11-05 13:48:40 +00:00
parent f1e50ecab3
commit 4a297a2443
435 changed files with 2009 additions and 2378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/perf/perf_arithm.cpp
+19 -19
View File
@@ -1,12 +1,10 @@
#include "perf_precomp.hpp"
using namespace std;
using namespace cv;
namespace opencv_test
{
using namespace perf;
using std::tr1::make_tuple;
using std::tr1::get;
#define TYPICAL_MAT_SIZES_CORE_ARITHM ::szVGA, ::sz720p, ::sz1080p
#define TYPICAL_MAT_SIZES_CORE_ARITHM szVGA, sz720p, sz1080p
#define TYPICAL_MAT_TYPES_CORE_ARITHM CV_8UC1, CV_8SC1, CV_16SC1, CV_16SC2, CV_16SC3, CV_16SC4, CV_8UC4, CV_32SC1, CV_32FC1
#define TYPICAL_MATS_CORE_ARITHM testing::Combine( testing::Values( TYPICAL_MAT_SIZES_CORE_ARITHM ), testing::Values( TYPICAL_MAT_TYPES_CORE_ARITHM ) )
@@ -20,7 +18,7 @@ PERF_TEST_P(Size_MatType, min, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c);
TEST_CYCLE() min(a, b, c);
TEST_CYCLE() cv::min(a, b, c);
SANITY_CHECK(c);
}
@@ -35,7 +33,7 @@ PERF_TEST_P(Size_MatType, minScalar, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c);
TEST_CYCLE() min(a, b, c);
TEST_CYCLE() cv::min(a, b, c);
SANITY_CHECK(c);
}
@@ -50,7 +48,7 @@ PERF_TEST_P(Size_MatType, max, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c);
TEST_CYCLE() max(a, b, c);
TEST_CYCLE() cv::max(a, b, c);
SANITY_CHECK(c);
}
@@ -65,7 +63,7 @@ PERF_TEST_P(Size_MatType, maxScalar, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c);
TEST_CYCLE() max(a, b, c);
TEST_CYCLE() cv::max(a, b, c);
SANITY_CHECK(c);
}
@@ -89,7 +87,7 @@ PERF_TEST_P(Size_MatType, absdiff, TYPICAL_MATS_CORE_ARITHM)
eps = 1;
}
TEST_CYCLE() absdiff(a, b, c);
TEST_CYCLE() cv::absdiff(a, b, c);
SANITY_CHECK(c, eps);
}
@@ -113,7 +111,7 @@ PERF_TEST_P(Size_MatType, absdiffScalar, TYPICAL_MATS_CORE_ARITHM)
eps = 1;
}
TEST_CYCLE() absdiff(a, b, c);
TEST_CYCLE() cv::absdiff(a, b, c);
SANITY_CHECK(c, eps);
}
@@ -138,7 +136,7 @@ PERF_TEST_P(Size_MatType, add, TYPICAL_MATS_CORE_ARITHM)
eps = 1;
}
TEST_CYCLE() add(a, b, c);
TEST_CYCLE() cv::add(a, b, c);
SANITY_CHECK(c, eps);
}
@@ -162,7 +160,7 @@ PERF_TEST_P(Size_MatType, addScalar, TYPICAL_MATS_CORE_ARITHM)
eps = 1;
}
TEST_CYCLE() add(a, b, c);
TEST_CYCLE() cv::add(a, b, c);
SANITY_CHECK(c, eps);
}
@@ -186,7 +184,7 @@ PERF_TEST_P(Size_MatType, subtract, TYPICAL_MATS_CORE_ARITHM)
eps = 1;
}
TEST_CYCLE() subtract(a, b, c);
TEST_CYCLE() cv::subtract(a, b, c);
SANITY_CHECK(c, eps);
}
@@ -210,7 +208,7 @@ PERF_TEST_P(Size_MatType, subtractScalar, TYPICAL_MATS_CORE_ARITHM)
eps = 1;
}
TEST_CYCLE() subtract(a, b, c);
TEST_CYCLE() cv::subtract(a, b, c);
SANITY_CHECK(c, eps);
}
@@ -229,7 +227,7 @@ PERF_TEST_P(Size_MatType, multiply, TYPICAL_MATS_CORE_ARITHM)
b /= (2 << 16);
}
TEST_CYCLE() multiply(a, b, c);
TEST_CYCLE() cv::multiply(a, b, c);
SANITY_CHECK(c, 1e-8);
}
@@ -250,7 +248,7 @@ PERF_TEST_P(Size_MatType, multiplyScale, TYPICAL_MATS_CORE_ARITHM)
b /= (2 << 16);
}
TEST_CYCLE() multiply(a, b, c, scale);
TEST_CYCLE() cv::multiply(a, b, c, scale);
SANITY_CHECK(c, 1e-8);
}
@@ -264,7 +262,7 @@ PERF_TEST_P(Size_MatType, divide, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c);
TEST_CYCLE() divide(a, b, c, scale);
TEST_CYCLE() cv::divide(a, b, c, scale);
SANITY_CHECK_NOTHING();
}
@@ -278,7 +276,9 @@ PERF_TEST_P(Size_MatType, reciprocal, TYPICAL_MATS_CORE_ARITHM)
declare.in(b, WARMUP_RNG).out(c);
TEST_CYCLE() divide(scale, b, c);
TEST_CYCLE() cv::divide(scale, b, c);
SANITY_CHECK_NOTHING();
}
} // namespace