From 9ba4f80d08757f4db1908c7f5aded2e90fa2a5f5 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 16 Apr 2014 11:13:06 +0000 Subject: Move setGPUIndex to CAlgorithm base class --- include/astra/Algorithm.h | 5 +++++ include/astra/CudaBackProjectionAlgorithm3D.h | 2 +- include/astra/CudaCglsAlgorithm3D.h | 2 +- include/astra/CudaFDKAlgorithm3D.h | 2 +- include/astra/CudaSirtAlgorithm3D.h | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h index d4c73f9..21632eb 100644 --- a/include/astra/Algorithm.h +++ b/include/astra/Algorithm.h @@ -89,6 +89,11 @@ public: */ virtual std::string description() const; + /** Set the GPU Index to run on. + * TODO: Move this from CAlgorithm to a Context-like class + */ + virtual void setGPUIndex(int /*_iGPUIndex*/) { }; + /** Signal the algorithm it should abort soon. * This is intended to be called from a different thread * while the algorithm is running. There are no guarantees diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h index b069da6..a9cc559 100644 --- a/include/astra/CudaBackProjectionAlgorithm3D.h +++ b/include/astra/CudaBackProjectionAlgorithm3D.h @@ -133,7 +133,7 @@ public: * * @param _iGPUIndex New GPU index. */ - void setGPUIndex(int _iGPUIndex); + void setGPUIndex(int _iGPUIndex) { m_iGPUIndex = _iGPUIndex; } protected: diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h index 47b61af..0d66327 100644 --- a/include/astra/CudaCglsAlgorithm3D.h +++ b/include/astra/CudaCglsAlgorithm3D.h @@ -140,7 +140,7 @@ public: * * @param _iGPUIndex New GPU index. */ - void setGPUIndex(int _iGPUIndex); + void setGPUIndex(int _iGPUIndex) { m_iGPUIndex = _iGPUIndex; } virtual void signalAbort(); diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 7ab9bbe..393e6c8 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -145,7 +145,7 @@ public: * * @param _iGPUIndex New GPU index. */ - void setGPUIndex(int _iGPUIndex); + void setGPUIndex(int _iGPUIndex) { m_iGPUIndex = _iGPUIndex; } protected: diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h index c2c794d..c9f2df5 100644 --- a/include/astra/CudaSirtAlgorithm3D.h +++ b/include/astra/CudaSirtAlgorithm3D.h @@ -154,7 +154,7 @@ public: * * @param _iGPUIndex New GPU index. */ - void setGPUIndex(int _iGPUIndex); + void setGPUIndex(int _iGPUIndex) { m_iGPUIndex = _iGPUIndex; } virtual void signalAbort(); -- cgit v1.2.3