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

added safe call support in cu files

Browse Source
This commit is contained in:
Anatoly Baksheev 2010-07-15 14:42:24 +00:00
parent 2c84a66ec7
commit 55b1e9cbc7
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/cuda/cuda_shared.hpp
View File

@ -51,7 +51,9 @@ namespace cv
{ {
typedef unsigned char uchar; typedef unsigned char uchar;
typedef unsigned short ushort; typedef unsigned short ushort;
typedef unsigned int uint; typedef unsigned int uint;
extern "C" void error( const char *error_string, const char *file, const int line, const char *func = "");
namespace impl namespace impl
{ {
@ -62,4 +64,8 @@ namespace cv
} }
} }
#ifdef __CUDACC__
#define cudaSafeCall(err) { if( cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__); }
#endif
#endif /* __OPENCV_CUDA_SHARED_HPP__ */ #endif /* __OPENCV_CUDA_SHARED_HPP__ */

1
modules/gpu/cuda/stereobm.cu
View File

@ -297,7 +297,6 @@ extern "C" void cv::gpu::impl::stereoBM_GPU(const DevMem2D& left, const DevMem2D
size_t smem_size = (BLOCK_W + N_DISPARITIES * SHARED_MEM_SIZE) * sizeof(unsigned int); size_t smem_size = (BLOCK_W + N_DISPARITIES * SHARED_MEM_SIZE) * sizeof(unsigned int);
#define cudaSafeCall
cudaSafeCall( cudaMemset2D(disp.ptr, disp.step, 0, disp.cols, disp. rows) ); cudaSafeCall( cudaMemset2D(disp.ptr, disp.step, 0, disp.cols, disp. rows) );
cudaSafeCall( cudaMemset2D(minSSD_buf.ptr, minSSD_buf.step, 0xFF, minSSD_buf.cols * minSSD_buf.elemSize(), disp. rows) ); cudaSafeCall( cudaMemset2D(minSSD_buf.ptr, minSSD_buf.step, 0xFF, minSSD_buf.cols * minSSD_buf.elemSize(), disp. rows) );

6
modules/gpu/src/precomp.cpp
View File

@ -42,3 +42,9 @@
#include "precomp.hpp" #include "precomp.hpp"
/* End of file. */ /* End of file. */
extern "C" void cv::gpu::error( const char *error_string, const char *file, const int line, const char *func)
{
cv::error( cv::Exception(CV_GpuApiCallError, error_string, func, file, line) );
}

23
modules/gpu/src/precomp.hpp
View File

@ -70,25 +70,14 @@
#include "cuda_runtime_api.h" #include "cuda_runtime_api.h"
#define cudaCallerSafeCall(err) err; #ifdef __GNUC__
#define cudaSafeCall(err) { if(cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__, __func__); }
#ifdef __GNUC__ #else
#define cudaSafeCall(err) __cudaSafeCall(err, __FILE__, __LINE__, __func__) #define cudaSafeCall(err) { if(cudaSuccess != err) cv::gpu::error(cudaGetErrorString(err), __FILE__, __LINE__); }
#else
#define cudaSafeCall(err) __cudaSafeCall(err, __FILE__, __LINE__)
#endif #endif
namespace cv #define cudaCallerSafeCall(err) err;
{
namespace gpu
{
static inline void __cudaSafeCall( cudaError err, const char *file, const int line, const char *func = "")
{
if( cudaSuccess != err)
cv::error( cv::Exception(CV_GpuApiCallError, cudaGetErrorString(err), func, file, line) );
}
}
}
#endif /* HAVE_CUDA */ #endif /* HAVE_CUDA */