diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
| commit | d9261bdb05cd0863a2c3747c812871dbb851646e (patch) | |
| tree | d1a81110e3fe213747a58f236e021a085417f663 /cuda/2d/cgls.cu | |
| parent | 9a58b7451179ed512f975bc4c90fb71f172250b9 (diff) | |
| download | astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.gz astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.bz2 astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.xz astra-d9261bdb05cd0863a2c3747c812871dbb851646e.zip | |
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.
Diffstat (limited to 'cuda/2d/cgls.cu')
| -rw-r--r-- | cuda/2d/cgls.cu | 4 |
1 files changed, 1 insertions, 3 deletions
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); |