From d9261bdb05cd0863a2c3747c812871dbb851646e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 14 Aug 2019 11:45:34 +0200 Subject: Replace signal-based abort handling by query-based handling The abort handling is currently only used to process Ctrl-C from Matlab. Since Matlab R2019a, it appears that calling utIsInterruptPending() from a thread other than the main thread will crash. The previous approach of checking utIsInterruptPending() in a thread, and then signalling the running algorithm was therefore broken. --- cuda/3d/cgls3d.cu | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cuda/3d/cgls3d.cu') diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu index 0df10f0..10c5f1e 100644 --- a/cuda/3d/cgls3d.cu +++ b/cuda/3d/cgls3d.cu @@ -146,8 +146,6 @@ bool CGLS::setBuffers(cudaPitchedPtr& _D_volumeData, bool CGLS::iterate(unsigned int iterations) { - shouldAbort = false; - if (!sliceInitialized) { // copy sinogram @@ -176,7 +174,7 @@ bool CGLS::iterate(unsigned int iterations) // iteration - for (unsigned int iter = 0; iter < iterations && !shouldAbort; ++iter) { + for (unsigned int iter = 0; iter < iterations && !astra::shouldAbort(); ++iter) { // w = A*p zeroProjectionData(D_w, dims); -- cgit v1.2.3