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

refactored cuda error handling; remove optional dependancies in soft cascade training app

Browse Source
This commit is contained in:
marina.kolpakova
2013-03-14 23:06:17 +04:00
parent a476664144
commit 157a98edf7
13 changed files with 37 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/softcascade/src/cuda/icf-sc.cu
View File

@@ -44,18 +44,18 @@
#include <float.h>
#include <stdio.h>
namespace
{
namespace cv { namespace softcascade { namespace internal {
void error(const char *error_string, const char *file, const int line, const char *func);
}}}
#if defined(__GNUC__)
#define cudaSafeCall(expr) ___cudaSafeCall(expr, __FILE__, __LINE__, __func__)
#else /* defined(__CUDACC__) || defined(__MSVC__) */
#define cudaSafeCall(expr) ___cudaSafeCall(expr, __FILE__, __LINE__)
#endif
inline void ___cudaSafeCall(cudaError_t err, const char *file, const int line, const char *func = "")
{
// if (cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), file, line, func);
}
static inline void ___cudaSafeCall(cudaError_t err, const char *file, const int line, const char *func = "")
{
if (cudaSuccess != err) cv::softcascade::internal::error(cudaGetErrorString(err), file, line, func);
}
#ifndef CV_PI