diff options
author | Daniel M. Pelt <D.M.Pelt@cwi.nl> | 2015-03-13 12:18:21 +0100 |
---|---|---|
committer | Daniel M. Pelt <D.M.Pelt@cwi.nl> | 2015-03-13 12:18:21 +0100 |
commit | c5507b6ef2abfab169150528a374526bb348bf62 (patch) | |
tree | 2e218781b8c90209f7ac53219cc59d3319fe3a73 /cuda/2d/util.cu | |
parent | 150951875c236f95a64fd132c26576bd19daca80 (diff) | |
download | astra-c5507b6ef2abfab169150528a374526bb348bf62.tar.gz astra-c5507b6ef2abfab169150528a374526bb348bf62.tar.bz2 astra-c5507b6ef2abfab169150528a374526bb348bf62.tar.xz astra-c5507b6ef2abfab169150528a374526bb348bf62.zip |
Adds ASTRA_*** defines for easier logging, and changes internal calls to these defines
Diffstat (limited to 'cuda/2d/util.cu')
-rw-r--r-- | cuda/2d/util.cu | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu index 6ced557..a4f8f3e 100644 --- a/cuda/2d/util.cu +++ b/cuda/2d/util.cu @@ -93,7 +93,7 @@ bool allocateVolume(float*& ptr, unsigned int width, unsigned int height, unsign cudaError_t ret = cudaMallocPitch((void**)&ptr, &p, sizeof(float)*width, height); if (ret != cudaSuccess) { reportCudaError(ret); - astra::CLogger::error(__FILE__,__LINE__,"Failed to allocate %dx%d GPU buffer", width, height); + ASTRA_ERROR("Failed to allocate %dx%d GPU buffer", width, height); return false; } @@ -261,7 +261,7 @@ bool cudaTextForceKernelsCompletion() cudaError_t returnedCudaError = cudaThreadSynchronize(); if(returnedCudaError != cudaSuccess) { - astra::CLogger::error(__FILE__,__LINE__,"Failed to force completion of cuda kernels: %d: %s.", returnedCudaError, cudaGetErrorString(returnedCudaError)); + ASTRA_ERROR("Failed to force completion of cuda kernels: %d: %s.", returnedCudaError, cudaGetErrorString(returnedCudaError)); return false; } @@ -271,7 +271,7 @@ bool cudaTextForceKernelsCompletion() void reportCudaError(cudaError_t err) { if(err != cudaSuccess) - astra::CLogger::error(__FILE__,__LINE__,"CUDA error %d: %s.", err, cudaGetErrorString(err)); + ASTRA_ERROR("CUDA error %d: %s.", err, cudaGetErrorString(err)); } |