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

added CUFFT errors handling into GPU module

Browse Source
This commit is contained in:
Alexey Spizhevoy
2010-12-22 08:03:53 +00:00
parent 8190837dd4
commit a6d9cce500
5 changed files with 92 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gpu/src/cuda/safe_call.hpp
View File

@@ -44,13 +44,16 @@
#define __OPENCV_CUDA_SAFE_CALL_HPP__
#include "cuda_runtime_api.h"
#include "cufft.h"
//#include <nppdefs.h>
#if defined(__GNUC__)
#define cudaSafeCall(expr) ___cudaSafeCall(expr, __FILE__, __LINE__, __func__)
#define cufftSafeCall(expr) ___cufftSafeCall(expr, __FILE__, __LINE__, __func__)
#define nppSafeCall(expr) ___nppSafeCall(expr, __FILE__, __LINE__, __func__)
#else /* defined(__CUDACC__) || defined(__MSVC__) */
#define cudaSafeCall(expr) ___cudaSafeCall(expr, __FILE__, __LINE__)
#define cufftSafeCall(expr) ___cufftSafeCall(expr, __FILE__, __LINE__)
#define nppSafeCall(expr) ___nppSafeCall(expr, __FILE__, __LINE__)
#endif
@@ -58,15 +61,22 @@ namespace cv
{
namespace gpu
{
void error( const char *error_string, const char *file, const int line, const char *func = "");
void nppError( int error, const char *file, const int line, const char *func = "");
void error(const char *error_string, const char *file, const int line, const char *func = "");
void nppError(int err, const char *file, const int line, const char *func = "");
void cufftError(int err, const char *file, const int line, const char *func = "");
static inline void ___cudaSafeCall(cudaError_t err, const char *file, const int line, const char *func = "")
{
if( cudaSuccess != err)
if (cudaSuccess != err)
cv::gpu::error(cudaGetErrorString(err), file, line, func);
}
static inline void ___cufftSafeCall(cufftResult_t err, const char *file, const int line, const char *func = "")
{
if (CUFFT_SUCCESS != err)
cv::gpu::cufftError(err, file, line, func);
}
static inline void ___nppSafeCall(int err, const char *file, const int line, const char *func = "")
{
if (err < 0)