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/2d/cgls.cu | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cuda/2d/cgls.cu') diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu index 696a0c1..b6a9fae 100644 --- a/cuda/2d/cgls.cu +++ b/cuda/2d/cgls.cu @@ -114,8 +114,6 @@ bool CGLS::copyDataToGPU(const float* pfSinogram, unsigned int iSinogramPitch, f bool CGLS::iterate(unsigned int iterations) { - shouldAbort = false; - if (!sliceInitialized) { // copy sinogram @@ -146,7 +144,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, wPitch, dims); -- cgit v1.2.3