third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced GPU -> CUDA

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-07-24 13:55:18 +04:00
parent 3c34b24f1f
commit fd88654b45
172 changed files with 2434 additions and 2436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/softcascade/include/opencv2/softcascade.hpp
+1 -1
View File
@@ -218,7 +218,7 @@ public:
CV_EXPORTS bool initModule_softcascade(void);
// ======================== GPU version for soft cascade ===================== //
// ======================== CUDA version for soft cascade ===================== //
class CV_EXPORTS ChannelsProcessor
{
modules/softcascade/perf/perf_cuda_softcascade.cpp
+6 -6
View File
@@ -13,12 +13,12 @@ using std::tr1::get;
};\
TEST_P(fixture##_##name, name /*perf*/){ RunPerfTestBody(); }\
INSTANTIATE_TEST_CASE_P(/*none*/, fixture##_##name, params);\
void fixture##_##name::PerfTestBody() { if (PERF_RUN_GPU()) __gpu(); else __cpu(); }
void fixture##_##name::PerfTestBody() { if (PERF_RUN_CUDA()) __gpu(); else __cpu(); }
#define RUN_CPU(fixture, name)\
void fixture##_##name::__cpu()
#define RUN_GPU(fixture, name)\
#define RUN_CUDA(fixture, name)\
void fixture##_##name::__gpu()
#define NO_CPU(fixture, name)\
@@ -60,7 +60,7 @@ SC_PERF_TEST_P(SCascadeTest, detect,
std::string("cv/cascadeandhog/cascades/sc_cvpr_2012_to_opencv_new_format.xml")),
testing::Values(std::string("cv/cascadeandhog/images/image_00000000_0.png"))))
RUN_GPU(SCascadeTest, detect)
RUN_CUDA(SCascadeTest, detect)
{
cv::Mat cpu = cv::imread(getDataPath(get<1>(GetParam())));;
ASSERT_FALSE(cpu.empty());
@@ -118,7 +118,7 @@ SC_PERF_TEST_P(SCascadeTestRoi, detectInRoi,
testing::Values(std::string("cv/cascadeandhog/images/image_00000000_0.png")),
testing::Range(0, 5)))
RUN_GPU(SCascadeTestRoi, detectInRoi)
RUN_CUDA(SCascadeTestRoi, detectInRoi)
{
cv::Mat cpu = cv::imread(getDataPath(get<1>(GetParam())));
ASSERT_FALSE(cpu.empty());
@@ -163,7 +163,7 @@ SC_PERF_TEST_P(SCascadeTestRoi, detectEachRoi,
testing::Values(std::string("cv/cascadeandhog/images/image_00000000_0.png")),
testing::Range(0, 10)))
RUN_GPU(SCascadeTestRoi, detectEachRoi)
RUN_CUDA(SCascadeTestRoi, detectEachRoi)
{
cv::Mat cpu = cv::imread(getDataPath(get<1>(GetParam())));
ASSERT_FALSE(cpu.empty());
@@ -202,7 +202,7 @@ SC_PERF_TEST_P(SCascadeTest, detectStream,
std::string("cv/cascadeandhog/cascades/sc_cvpr_2012_to_opencv_new_format.xml")),
testing::Values(std::string("cv/cascadeandhog/images/image_00000000_0.png"))))
RUN_GPU(SCascadeTest, detectStream)
RUN_CUDA(SCascadeTest, detectStream)
{
cv::Mat cpu = cv::imread(getDataPath(get<1>(GetParam())));
ASSERT_FALSE(cpu.empty());
modules/softcascade/test/utility.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ void DeviceManager::load(int i)
if (!info.isCompatible())
{
msg << "Device " << i << " [" << info.name() << "] is NOT compatible with current GPU module build";
msg << "Device " << i << " [" << info.name() << "] is NOT compatible with current CUDA module build";
CV_Error(cv::Error::StsBadArg, msg.str());
}
modules/softcascade/test/utility.hpp
+1 -1
View File
@@ -72,4 +72,4 @@ private:
# define ALL_DEVICES testing::ValuesIn(std::vector<cv::cuda::DeviceInfo>())
#endif
#endif // __OPENCV_GPU_TEST_UTILITY_HPP__
#endif // __OPENCV_CUDA_TEST_UTILITY_HPP__