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

removed GPU_/CPU_ prefix from gpu's sanity test

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-07-18 13:41:27 +04:00
parent 12f304ec54
commit f87ef77269
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,10 +51,6 @@ static void setCurrentThreadAffinityMask(int mask)
} }
#endif #endif
#ifdef HAVE_CUDA
# include <opencv2/core/gpumat.hpp>
#endif
namespace { namespace {
class PerfEnvironment: public ::testing::Environment class PerfEnvironment: public ::testing::Environment
@ -556,13 +552,6 @@ Regression& Regression::operator() (const std::string& name, cv::InputArray arra
std::string nodename = getCurrentTestNodeName(); std::string nodename = getCurrentTestNodeName();
// This is a hack for compatibility and it should eventually get removed.
// gpu's tests don't even have CPU sanity data anymore.
if(suiteName == "gpu")
{
nodename = (PERF_RUN_GPU() ? "GPU_" : "CPU_") + nodename;
}
cv::FileNode n = rootIn[nodename]; cv::FileNode n = rootIn[nodename];
if(n.isNone()) if(n.isNone())
{ {