Skip to content

O
opencv
Commit f87ef772 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

removed GPU_/CPU_ prefix from gpu's sanity test

parent 12f304ec
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 11 deletions
modules/ts/src/ts_perf.cpp
View file @ f87ef772
...@@ -51,10 +51,6 @@ static void setCurrentThreadAffinityMask(int mask) ...@@ -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 ...@@ -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())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment