Add global astra_set_gpu_index function

4 files changed, 43 insertions, 36 deletions

diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu
index 5ae5d08..f04607f 100644
--- a/cuda/2d/algo.cu
+++ b/cuda/2d/algo.cu
@@ -99,12 +99,14 @@ void ReconAlgo::reset()
 
 bool ReconAlgo::setGPUIndex(int iGPUIndex)
 {
-	cudaSetDevice(iGPUIndex);
-	cudaError_t err = cudaGetLastError();
+	if (iGPUIndex != -1) {
+		cudaSetDevice(iGPUIndex);
+		cudaError_t err = cudaGetLastError();
 
-	// Ignore errors caused by calling cudaSetDevice multiple times
-	if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
-		return false;
+		// Ignore errors caused by calling cudaSetDevice multiple times
+		if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
+			return false;
+	}
 
 	return true;
 }
diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu
index 5d53da0..2240629 100644
--- a/cuda/2d/astra.cu
+++ b/cuda/2d/astra.cu
@@ -195,13 +195,15 @@ bool AstraFBP::init(int iGPUIndex)
 		return false;
 	}
 
-	cudaSetDevice(iGPUIndex);
-	cudaError_t err = cudaGetLastError();
+	if (iGPUIndex != -1) {
+		cudaSetDevice(iGPUIndex);
+		cudaError_t err = cudaGetLastError();
 
-	// Ignore errors caused by calling cudaSetDevice multiple times
-	if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
-	{
-		return false;
+		// Ignore errors caused by calling cudaSetDevice multiple times
+		if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
+		{
+			return false;
+		}
 	}
 
 	bool ok = allocateVolume(pData->D_volumeData, pData->dims.iVolWidth+2, pData->dims.iVolHeight+2, pData->volumePitch);
@@ -563,13 +565,14 @@ bool astraCudaFP(const float* pfVolume, float* pfSinogram,
 	dims.iVolWidth = iVolWidth;
 	dims.iVolHeight = iVolHeight;
 
-	cudaSetDevice(iGPUIndex);
-	cudaError_t err = cudaGetLastError();
-
-	// Ignore errors caused by calling cudaSetDevice multiple times
-	if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
-		return false;
+	if (iGPUIndex != -1) {
+		cudaSetDevice(iGPUIndex);
+		cudaError_t err = cudaGetLastError();
 
+		// Ignore errors caused by calling cudaSetDevice multiple times
+		if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
+			return false;
+	}
 
 	bool ok;
 
@@ -649,13 +652,14 @@ bool astraCudaFanFP(const float* pfVolume, float* pfSinogram,
 	dims.iVolWidth = iVolWidth;
 	dims.iVolHeight = iVolHeight;
 
-	cudaSetDevice(iGPUIndex);
-	cudaError_t err = cudaGetLastError();
-
-	// Ignore errors caused by calling cudaSetDevice multiple times
-	if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
-		return false;
+	if (iGPUIndex != -1) {
+		cudaSetDevice(iGPUIndex);
+		cudaError_t err = cudaGetLastError();
 
+		// Ignore errors caused by calling cudaSetDevice multiple times
+		if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
+			return false;
+	}
 
 	bool ok;
 
@@ -759,13 +763,14 @@ bool astraCudaFanFP(const float* pfVolume, float* pfSinogram,
 	dims.iVolWidth = iVolWidth;
 	dims.iVolHeight = iVolHeight;
 
-	cudaSetDevice(iGPUIndex);
-	cudaError_t err = cudaGetLastError();
-
-	// Ignore errors caused by calling cudaSetDevice multiple times
-	if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
-		return false;
+	if (iGPUIndex != -1) {
+		cudaSetDevice(iGPUIndex);
+		cudaError_t err = cudaGetLastError();
 
+		// Ignore errors caused by calling cudaSetDevice multiple times
+		if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
+			return false;
+	}
 
 	bool ok;
 
diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu
index db0036e..28b77cc 100644
--- a/cuda/2d/darthelper.cu
+++ b/cuda/2d/darthelper.cu
@@ -344,12 +344,14 @@ void dartSmoothing(float* out, const float* in, float b, unsigned int radius, un
 
 bool setGPUIndex(int iGPUIndex)
 {
-	cudaSetDevice(iGPUIndex);
-	cudaError_t err = cudaGetLastError();
+	if (iGPUIndex != -1) {
+		cudaSetDevice(iGPUIndex);
+		cudaError_t err = cudaGetLastError();
 
-	// Ignore errors caused by calling cudaSetDevice multiple times
-	if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
-		return false;
+		// Ignore errors caused by calling cudaSetDevice multiple times
+		if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
+			return false;
+	}
 
 	return true;
 }
diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h
index e05f01e..3694b96 100644
--- a/cuda/2d/darthelper.h
+++ b/cuda/2d/darthelper.h
@@ -29,8 +29,6 @@ $Id$
 #ifndef _CUDA_ARITH2_H
 #define _CUDA_ARITH2_H
 
-#include <cuda.h>
-
 namespace astraCUDA {
 
 	void roiSelect(float* out, float radius, unsigned int width, unsigned int height);