generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow gpu module write sanity data for GPU and CPU tests in one xml

Browse Source
This commit is contained in:
marina.kolpakova 2012-10-12 14:32:47 +04:00
parent 4500c48349
commit 800cb9d0e6
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,6 +187,7 @@ private:
cv::FileStorage storageOut; cv::FileStorage storageOut;
cv::FileNode rootIn; cv::FileNode rootIn;
std::string currentTestNodeName; std::string currentTestNodeName;
std::string suiteName;
cv::FileStorage& write(); cv::FileStorage& write();

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

@ -184,6 +184,8 @@ void Regression::init(const std::string& testSuitName, const std::string& ext)
storageOutPath = testSuitName; storageOutPath = testSuitName;
} }
suiteName = testSuitName;
try try
{ {
if (storageIn.open(storageInPath, cv::FileStorage::READ)) if (storageIn.open(storageInPath, cv::FileStorage::READ))
@ -562,6 +564,12 @@ Regression& Regression::operator() (const std::string& name, cv::InputArray arra
std::string nodename = getCurrentTestNodeName(); std::string nodename = getCurrentTestNodeName();
#ifdef HAVE_CUDA
static const std::string prefix = (param_run_cpu)? "CPU_" : "GPU_";
if(suiteName == "gpu")
nodename = prefix + nodename;
#endif
cv::FileNode n = rootIn[nodename]; cv::FileNode n = rootIn[nodename];
if(n.isNone()) if(n.isNone())
{ {