From 2895e27613dab0815e9f0f2f0ed7853d31f856b4 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 2 Apr 2014 14:21:59 +0000 Subject: Add global astra_set_gpu_index function --- include/astra/CudaBackProjectionAlgorithm.h | 2 +- include/astra/CudaCglsAlgorithm.h | 2 +- include/astra/CudaEMAlgorithm.h | 2 +- include/astra/CudaFilteredBackProjectionAlgorithm.h | 2 +- include/astra/CudaForwardProjectionAlgorithm.h | 2 +- include/astra/CudaForwardProjectionAlgorithm3D.h | 2 +- include/astra/CudaReconstructionAlgorithm2D.h | 2 +- include/astra/CudaSartAlgorithm.h | 2 +- include/astra/CudaSirtAlgorithm.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/astra/CudaBackProjectionAlgorithm.h b/include/astra/CudaBackProjectionAlgorithm.h index 965c734..09a2a65 100644 --- a/include/astra/CudaBackProjectionAlgorithm.h +++ b/include/astra/CudaBackProjectionAlgorithm.h @@ -91,7 +91,7 @@ public: bool initialize(CProjector2D* _pProjector, CFloat32ProjectionData2D* _pSinogram, CFloat32VolumeData2D* _pReconstruction, - int _iGPUindex = 0, int _iPixelSuperSampling = 1); + int _iGPUindex = -1, int _iPixelSuperSampling = 1); /** Get a description of the class. * diff --git a/include/astra/CudaCglsAlgorithm.h b/include/astra/CudaCglsAlgorithm.h index 7734d6e..a529bfd 100644 --- a/include/astra/CudaCglsAlgorithm.h +++ b/include/astra/CudaCglsAlgorithm.h @@ -101,7 +101,7 @@ public: bool initialize(CProjector2D* _pProjector, CFloat32ProjectionData2D* _pSinogram, CFloat32VolumeData2D* _pReconstruction, - int _iGPUindex = 0, int _iDetectorSuperSampling = 1, + int _iGPUindex = -1, int _iDetectorSuperSampling = 1, int _iPixelSuperSampling = 1); /** Get a description of the class. diff --git a/include/astra/CudaEMAlgorithm.h b/include/astra/CudaEMAlgorithm.h index ff22dd4..ca9c9f6 100644 --- a/include/astra/CudaEMAlgorithm.h +++ b/include/astra/CudaEMAlgorithm.h @@ -72,7 +72,7 @@ public: bool initialize(CProjector2D* _pProjector, CFloat32ProjectionData2D* _pSinogram, CFloat32VolumeData2D* _pReconstruction, - int _iGPUindex = 0, int _iDetectorSuperSampling = 1, + int _iGPUindex = -1, int _iDetectorSuperSampling = 1, int _iPixelSuperSampling = 1); /** Get a description of the class. diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h index 4b7b904..c496c8f 100644 --- a/include/astra/CudaFilteredBackProjectionAlgorithm.h +++ b/include/astra/CudaFilteredBackProjectionAlgorithm.h @@ -61,7 +61,7 @@ public: virtual ~CCudaFilteredBackProjectionAlgorithm(); virtual bool initialize(const Config& _cfg); - bool initialize(CFloat32ProjectionData2D * _pSinogram, CFloat32VolumeData2D * _pReconstruction, E_FBPFILTER _eFilter, const float * _pfFilter = NULL, int _iFilterWidth = 0, int _iGPUIndex = 0, float _fFilterParameter = -1.0f); + bool initialize(CFloat32ProjectionData2D * _pSinogram, CFloat32VolumeData2D * _pReconstruction, E_FBPFILTER _eFilter, const float * _pfFilter = NULL, int _iFilterWidth = 0, int _iGPUIndex = -1, float _fFilterParameter = -1.0f); virtual void run(int _iNrIterations = 0); diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h index 53b6c8e..6a6ba24 100644 --- a/include/astra/CudaForwardProjectionAlgorithm.h +++ b/include/astra/CudaForwardProjectionAlgorithm.h @@ -103,7 +103,7 @@ public: CVolumeGeometry2D* _pVolumeGeometry, CFloat32VolumeData2D* _pVolume, CFloat32ProjectionData2D* _pSinogram, - int _iGPUindex = 0, int _iDetectorSuperSampling = 1); + int _iGPUindex = -1, int _iDetectorSuperSampling = 1); /** Get all information parameters * diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h index 72c6a00..3312eec 100644 --- a/include/astra/CudaForwardProjectionAlgorithm3D.h +++ b/include/astra/CudaForwardProjectionAlgorithm3D.h @@ -74,7 +74,7 @@ public: bool initialize(CProjector3D* _pProjector, CFloat32ProjectionData3DMemory* _pSinogram, CFloat32VolumeData3DMemory* _pReconstruction, - int _iGPUindex = 0, int _iDetectorSuperSampling = 1); + int _iGPUindex = -1, int _iDetectorSuperSampling = 1); /** Get all information parameters diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index 88fc344..68f4b5d 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.h @@ -90,7 +90,7 @@ public: virtual bool initialize(CProjector2D* _pProjector, CFloat32ProjectionData2D* _pSinogram, CFloat32VolumeData2D* _pReconstruction, - int _iGPUindex = 0, int _iDetectorSuperSampling = 1, + int _iGPUindex = -1, int _iDetectorSuperSampling = 1, int _iPixelSuperSampling = 1); diff --git a/include/astra/CudaSartAlgorithm.h b/include/astra/CudaSartAlgorithm.h index 319e1e9..49845f2 100644 --- a/include/astra/CudaSartAlgorithm.h +++ b/include/astra/CudaSartAlgorithm.h @@ -93,7 +93,7 @@ public: bool initialize(CProjector2D* _pProjector, CFloat32ProjectionData2D* _pSinogram, CFloat32VolumeData2D* _pReconstruction, - int _iGPUindex = 0, int _iDetectorSuperSampling = 1); + int _iGPUindex = -1, int _iDetectorSuperSampling = 1); /** Get a description of the class. * diff --git a/include/astra/CudaSirtAlgorithm.h b/include/astra/CudaSirtAlgorithm.h index 7f3d67b..34b5a66 100644 --- a/include/astra/CudaSirtAlgorithm.h +++ b/include/astra/CudaSirtAlgorithm.h @@ -107,7 +107,7 @@ public: bool initialize(CProjector2D* _pProjector, CFloat32ProjectionData2D* _pSinogram, CFloat32VolumeData2D* _pReconstruction, - int _iGPUindex = 0, int _iDetectorSuperSampling = 1, + int _iGPUindex = -1, int _iDetectorSuperSampling = 1, int _iPixelSuperSampling = 1); /** Get a description of the class. -- cgit v1.2.3