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

Merge pull request #1910 from alalek:ts_perf_warmuptype

Browse Source
This commit is contained in:
Roman Donchenko 2013-12-03 13:08:44 +04:00 committed by OpenCV Buildbot
commit d2b46d421f
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/ts/include/opencv2/ts/ts_perf.hpp
View File

@ -288,7 +288,7 @@ protected:
//_declareHelper declare; //_declareHelper declare;
enum enum WarmUpType
{ {
WARMUP_READ, WARMUP_READ,
WARMUP_WRITE, WARMUP_WRITE,
@ -297,7 +297,7 @@ protected:
}; };
void reportMetrics(bool toJUnitXML = false); void reportMetrics(bool toJUnitXML = false);
static void warmup(cv::InputOutputArray a, int wtype = WARMUP_READ); static void warmup(cv::InputOutputArray a, WarmUpType wtype = WARMUP_READ);
performance_metrics& calcMetrics(); performance_metrics& calcMetrics();
void RunPerfTestBody(); void RunPerfTestBody();
@ -327,23 +327,23 @@ private:
static int64 _timeadjustment; static int64 _timeadjustment;
static int64 _calibrate(); static int64 _calibrate();
static void warmup_impl(cv::Mat m, int wtype); static void warmup_impl(cv::Mat m, WarmUpType wtype);
static int getSizeInBytes(cv::InputArray a); static int getSizeInBytes(cv::InputArray a);
static cv::Size getSize(cv::InputArray a); static cv::Size getSize(cv::InputArray a);
static void declareArray(SizeVector& sizes, cv::InputOutputArray a, int wtype = 0); static void declareArray(SizeVector& sizes, cv::InputOutputArray a, WarmUpType wtype);
class CV_EXPORTS _declareHelper class CV_EXPORTS _declareHelper
{ {
public: public:
_declareHelper& in(cv::InputOutputArray a1, int wtype = WARMUP_READ); _declareHelper& in(cv::InputOutputArray a1, WarmUpType wtype = WARMUP_READ);
_declareHelper& in(cv::InputOutputArray a1, cv::InputOutputArray a2, int wtype = WARMUP_READ); _declareHelper& in(cv::InputOutputArray a1, cv::InputOutputArray a2, WarmUpType wtype = WARMUP_READ);
_declareHelper& in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, int wtype = WARMUP_READ); _declareHelper& in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, WarmUpType wtype = WARMUP_READ);
_declareHelper& in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, int wtype = WARMUP_READ); _declareHelper& in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, WarmUpType wtype = WARMUP_READ);
_declareHelper& out(cv::InputOutputArray a1, int wtype = WARMUP_WRITE); _declareHelper& out(cv::InputOutputArray a1, WarmUpType wtype = WARMUP_WRITE);
_declareHelper& out(cv::InputOutputArray a1, cv::InputOutputArray a2, int wtype = WARMUP_WRITE); _declareHelper& out(cv::InputOutputArray a1, cv::InputOutputArray a2, WarmUpType wtype = WARMUP_WRITE);
_declareHelper& out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, int wtype = WARMUP_WRITE); _declareHelper& out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, WarmUpType wtype = WARMUP_WRITE);
_declareHelper& out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, int wtype = WARMUP_WRITE); _declareHelper& out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, WarmUpType wtype = WARMUP_WRITE);
_declareHelper& iterations(unsigned int n); _declareHelper& iterations(unsigned int n);
_declareHelper& time(double timeLimitSecs); _declareHelper& time(double timeLimitSecs);

22
modules/ts/src/ts_perf.cpp
View File

@ -851,7 +851,7 @@ TestBase::TestBase(): declare(this)
#endif #endif
void TestBase::declareArray(SizeVector& sizes, cv::InputOutputArray a, int wtype) void TestBase::declareArray(SizeVector& sizes, cv::InputOutputArray a, WarmUpType wtype)
{ {
if (!a.empty()) if (!a.empty())
{ {
@ -862,7 +862,7 @@ void TestBase::declareArray(SizeVector& sizes, cv::InputOutputArray a, int wtype
ADD_FAILURE() << " Uninitialized input/output parameters are not allowed for performance tests"; ADD_FAILURE() << " Uninitialized input/output parameters are not allowed for performance tests";
} }
void TestBase::warmup(cv::InputOutputArray a, int wtype) void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype)
{ {
if (a.empty()) return; if (a.empty()) return;
if (a.kind() != cv::_InputArray::STD_VECTOR_MAT && a.kind() != cv::_InputArray::STD_VECTOR_VECTOR) if (a.kind() != cv::_InputArray::STD_VECTOR_MAT && a.kind() != cv::_InputArray::STD_VECTOR_VECTOR)
@ -974,7 +974,7 @@ bool TestBase::next()
return has_next; return has_next;
} }
void TestBase::warmup_impl(cv::Mat m, int wtype) void TestBase::warmup_impl(cv::Mat m, WarmUpType wtype)
{ {
switch(wtype) switch(wtype)
{ {
@ -1411,14 +1411,14 @@ TestBase::_declareHelper& TestBase::_declareHelper::runs(unsigned int runsNumber
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->inputData, a1, wtype); TestBase::declareArray(test->inputData, a1, wtype);
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, cv::InputOutputArray a2, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, cv::InputOutputArray a2, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->inputData, a1, wtype); TestBase::declareArray(test->inputData, a1, wtype);
@ -1426,7 +1426,7 @@ TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1,
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->inputData, a1, wtype); TestBase::declareArray(test->inputData, a1, wtype);
@ -1435,7 +1435,7 @@ TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1,
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->inputData, a1, wtype); TestBase::declareArray(test->inputData, a1, wtype);
@ -1445,14 +1445,14 @@ TestBase::_declareHelper& TestBase::_declareHelper::in(cv::InputOutputArray a1,
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->outputData, a1, wtype); TestBase::declareArray(test->outputData, a1, wtype);
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, cv::InputOutputArray a2, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, cv::InputOutputArray a2, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->outputData, a1, wtype); TestBase::declareArray(test->outputData, a1, wtype);
@ -1460,7 +1460,7 @@ TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1,
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->outputData, a1, wtype); TestBase::declareArray(test->outputData, a1, wtype);
@ -1469,7 +1469,7 @@ TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1,
return *this; return *this;
} }
TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, int wtype) TestBase::_declareHelper& TestBase::_declareHelper::out(cv::InputOutputArray a1, cv::InputOutputArray a2, cv::InputOutputArray a3, cv::InputOutputArray a4, WarmUpType wtype)
{ {
if (!test->times.empty()) return *this; if (!test->times.empty()) return *this;
TestBase::declareArray(test->outputData, a1, wtype); TestBase::declareArray(test->outputData, a1, wtype);