removed GPU_/CPU_ prefix from gpu's sanity test

pull/1147/head
Vladislav Vinogradov 12 years ago
parent 12f304ec54
commit f87ef77269
  1. 11
      modules/ts/src/ts_perf.cpp

@ -51,10 +51,6 @@ static void setCurrentThreadAffinityMask(int mask)
}
#endif
#ifdef HAVE_CUDA
# include <opencv2/core/gpumat.hpp>
#endif
namespace {
class PerfEnvironment: public ::testing::Environment
@ -556,13 +552,6 @@ Regression& Regression::operator() (const std::string& name, cv::InputArray arra
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];
if(n.isNone())
{

Loading…
Cancel
Save