From d9261bdb05cd0863a2c3747c812871dbb851646e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
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/algo3d.cu  |  2 --
 cuda/3d/astra3d.cu | 16 ----------------
 cuda/3d/cgls3d.cu  |  4 +---
 cuda/3d/sirt3d.cu  |  4 +---
 4 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'cuda/3d')

diff --git a/cuda/3d/algo3d.cu b/cuda/3d/algo3d.cu
index b4a435b..3a83194 100644
--- a/cuda/3d/algo3d.cu
+++ b/cuda/3d/algo3d.cu
@@ -39,7 +39,6 @@ ReconAlgo3D::ReconAlgo3D()
 {
 	coneProjs = 0;
 	par3DProjs = 0;
-	shouldAbort = false;
 }
 
 ReconAlgo3D::~ReconAlgo3D()
@@ -53,7 +52,6 @@ void ReconAlgo3D::reset()
 	coneProjs = 0;
 	delete[] par3DProjs;
 	par3DProjs = 0;
-	shouldAbort = false;
 }
 
 bool ReconAlgo3D::setConeGeometry(const SDimensions3D& _dims, const SConeProjection* _angles, const SProjectorParams3D& _params)
diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu
index be258be..51e76cd 100644
--- a/cuda/3d/astra3d.cu
+++ b/cuda/3d/astra3d.cu
@@ -625,14 +625,6 @@ bool AstraSIRT3d::getReconstruction(float* pfReconstruction,
 	return true;
 }
 
-void AstraSIRT3d::signalAbort()
-{
-	if (!pData->initialized)
-		return;
-
-	pData->sirt.signalAbort();
-}
-
 float AstraSIRT3d::computeDiffNorm()
 {
 	if (!pData->initialized)
@@ -1006,14 +998,6 @@ bool AstraCGLS3d::getReconstruction(float* pfReconstruction,
 	return true;
 }
 
-void AstraCGLS3d::signalAbort()
-{
-	if (!pData->initialized)
-		return;
-
-	pData->cgls.signalAbort();
-}
-
 float AstraCGLS3d::computeDiffNorm()
 {
 	if (!pData->initialized)
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);
diff --git a/cuda/3d/sirt3d.cu b/cuda/3d/sirt3d.cu
index 332589e..869b2fd 100644
--- a/cuda/3d/sirt3d.cu
+++ b/cuda/3d/sirt3d.cu
@@ -235,8 +235,6 @@ bool SIRT::setBuffers(cudaPitchedPtr& _D_volumeData,
 
 bool SIRT::iterate(unsigned int iterations)
 {
-	shouldAbort = false;
-
 	if (useVolumeMask || useSinogramMask)
 		precomputeWeights();
 
@@ -267,7 +265,7 @@ bool SIRT::iterate(unsigned int iterations)
 
 
 	// iteration
-	for (unsigned int iter = 0; iter < iterations && !shouldAbort; ++iter) {
+	for (unsigned int iter = 0; iter < iterations && !astra::shouldAbort(); ++iter) {
 		// copy sinogram to projection data
 		duplicateProjectionData(D_projData, D_sinoData, dims);
 
-- 
cgit v1.2.3