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

pull/41/head^2
marina.kolpakova 12 years ago
parent 4500c48349
commit 800cb9d0e6
  1. 1
      modules/ts/include/opencv2/ts/ts_perf.hpp
  2. 8
      modules/ts/src/ts_perf.cpp

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

@ -184,6 +184,8 @@ void Regression::init(const std::string& testSuitName, const std::string& ext)
storageOutPath = testSuitName;
}
suiteName = testSuitName;
try
{
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();
#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];
if(n.isNone())
{

Loading…
Cancel
Save