Skip to content
This repository has been archived by the owner on Jul 21, 2018. It is now read-only.

Commit

Permalink
BUG: Address memory leak in GetImageFromArray
Browse files Browse the repository at this point in the history
  • Loading branch information
thewtex committed Sep 20, 2016
1 parent d5a2450 commit 4d006eb
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 2 deletions.
2 changes: 2 additions & 0 deletions include/itkPyBuffer.hxx
Expand Up @@ -153,6 +153,8 @@ PyBuffer<TImage>
OutputImagePointer output = importer->GetOutput();
output->DisconnectPipeline();

PyBuffer_Release(&pyBuffer);

return output;
}

Expand Down
7 changes: 5 additions & 2 deletions test/CMakeLists.txt
Expand Up @@ -13,7 +13,10 @@
# COMMAND BridgeNumPyTestDriver itkPyBufferTest)
message("+++++++++" ${CMAKE_CURRENT_SOURCE_DIR})
if(ITK_WRAP_PYTHON)
itk_python_add_test(NAME DicomSliceReadPythonTest
itk_python_add_test(NAME itkDicomSliceReadPythonTest
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/itkPyBufferTest.py
)
)
itk_python_add_test(NAME itkPyBufferMemoryLeakTest
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/itkPyBufferMemoryLeakTest.py
)
endif()
63 changes: 63 additions & 0 deletions test/itkPyBufferMemoryLeakTest.py
@@ -0,0 +1,63 @@
#==========================================================================
#
# Copyright Insight Software Consortium
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0.txt
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#==========================================================================*/
import sys
try:
import numpy as np
except ImportError:
# We don't have numpy -- bail
sys.exit(0)
import itk
import resource

ImageType = itk.Image[itk.F, 3]
converter = itk.PyBuffer[ImageType]

# adding +1 to numpy created once
inputNumpyVolume = np.ones([100,100,100], dtype=np.float32)
n = 10
M = []
X = range(n)
for i in range(n):
inputNumpyVolume += 1
inputVolume = converter.GetImageFromArray(inputNumpyVolume)
M.append(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss)

if M[5] - M[4] > 1000:
print('Memory leak!')
sys.exit(1)

# creating new numpy volume each time
M = []
X = [x + n for x in range(n)]
for i in range(n):
inputNumpyVolume = np.ones([100,100,100], dtype=np.float32)
inputVolume = converter.GetImageFromArray(inputNumpyVolume)
M.append(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss)
if M[5] - M[4] > 1000:
print('Memory leak!')
sys.exit(1)

# creating new numpy volume but not calling converter.GetImageFromArray(inputNumpyVolume)
M = []
X = [x + 2*n for x in range(n)]
for i in range(n):
inputNumpyVolume = np.ones([100,100,100], dtype=np.float32)
M.append(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss)
if M[5] - M[4] > 1000:
print('Memory leak!')
sys.exit(1)

0 comments on commit 4d006eb

Please sign in to comment.