Fixed memory leak with Cuda context manager

SimonRit · Oct 13, 2014 · 435c858 · 435c858
1 parent daaac4c
commit 435c858
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/utilities/ITKCudaCommon/include/itkCudaDataManager.h b/utilities/ITKCudaCommon/include/itkCudaDataManager.h
@@ -45,15 +45,13 @@ class GPUMemPointer: public LightObject
   void Allocate(size_t bufferSize)
     {
     m_BufferSize = bufferSize;
-    CUDA_CHECK(cuCtxSetCurrent(*(itk::CudaContextManager::GetInstance()->GetCurrentContext()))); // (peter) added this line
     CUDA_CHECK(cudaMalloc(&m_GPUBuffer, bufferSize));
     }
 
   ~GPUMemPointer()
     {
     if(m_GPUBuffer)
       {
-      CUDA_CHECK(cuCtxSetCurrent(*(itk::CudaContextManager::GetInstance()->GetCurrentContext()))); // (peter) added this line
       CUDA_CHECK(cudaFree(m_GPUBuffer));
       m_GPUBuffer = 0;
       }

diff --git a/utilities/ITKCudaCommon/src/itkCudaDataManager.cxx b/utilities/ITKCudaCommon/src/itkCudaDataManager.cxx
@@ -25,6 +25,7 @@ namespace itk
 CudaDataManager::CudaDataManager()
 {
   m_ContextManager = CudaContextManager::GetInstance();
+  CUDA_CHECK(cuCtxSetCurrent(*(m_ContextManager->GetCurrentContext())));
   m_CPUBuffer = NULL;
   m_GPUBuffer = GPUMemPointer::New();
   this->Initialize();