diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2021-11-16 11:28:05 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2021-11-16 11:28:05 +0100 |
| commit | d59619737b79ca3bd732fedaff6665e600ee1335 (patch) | |
| tree | 0cd6892de61ec80dd9f718b7f5980a83b4111d3e | |
| parent | 231dd3e5e28319aa16155efd9ec7fdc69834666b (diff) | |
| download | astra-d59619737b79ca3bd732fedaff6665e600ee1335.tar.gz astra-d59619737b79ca3bd732fedaff6665e600ee1335.tar.bz2 astra-d59619737b79ca3bd732fedaff6665e600ee1335.tar.xz astra-d59619737b79ca3bd732fedaff6665e600ee1335.zip | |
Add new checkCuda function to simplify error handling
| -rw-r--r-- | cuda/2d/util.cu | 9 | ||||
| -rw-r--r-- | include/astra/cuda/2d/util.h | 1 | ||||
| -rw-r--r-- | include/astra/cuda/3d/util3d.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu index 2a47472..ce652cb 100644 --- a/cuda/2d/util.cu +++ b/cuda/2d/util.cu @@ -274,5 +274,14 @@ void reportCudaError(cudaError_t err) ASTRA_ERROR("CUDA error %d: %s.", err, cudaGetErrorString(err)); } +bool checkCuda(cudaError_t err, const char *msg) +{ + if (err != cudaSuccess) { + ASTRA_ERROR("%s: CUDA error %d: %s.", msg, err, cudaGetErrorString(err)); + return false; + } else { + return true; + } +} } diff --git a/include/astra/cuda/2d/util.h b/include/astra/cuda/2d/util.h index 49079ef..a7bba89 100644 --- a/include/astra/cuda/2d/util.h +++ b/include/astra/cuda/2d/util.h @@ -74,6 +74,7 @@ void duplicateProjectionData(float* D_dst, float* D_src, unsigned int pitch, con bool cudaTextForceKernelsCompletion(); void reportCudaError(cudaError_t err); +bool checkCuda(cudaError_t err, const char *msg); float dotProduct2D(float* D_data, unsigned int pitch, diff --git a/include/astra/cuda/3d/util3d.h b/include/astra/cuda/3d/util3d.h index 5f805df..e902a85 100644 --- a/include/astra/cuda/3d/util3d.h +++ b/include/astra/cuda/3d/util3d.h @@ -38,6 +38,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. namespace astraCUDA3d { +using astraCUDA::checkCuda; + cudaPitchedPtr allocateVolumeData(const SDimensions3D& dims); cudaPitchedPtr allocateProjectionData(const SDimensions3D& dims); bool zeroVolumeData(cudaPitchedPtr& D_data, const SDimensions3D& dims); |