Skip to content

ENH: Cleanup python wrapping tests #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fbudin69500 merged 2 commits into from
Mar 30, 2019
Merged

ENH: Cleanup python wrapping tests #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb18686
ENH: Cleanup python wrapping tests
maekclena Mar 28, 2019
a82bb00
ENH: Address review comments
maekclena Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Modules/Filtering/MathematicalMorphology/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,18 @@ itk_add_test(NAME itkRankImageFilterTest10
# some tests will fail if dim=2 and unsigned short are not wrapped
list(FIND ITK_WRAP_IMAGE_DIMS 2 wrap_2_index)
if(ITK_WRAP_unsigned_char AND wrap_2_index GREATER -1)
itk_python_add_test(NAME PythonFlatStructuringElementBall
TEST_DRIVER_ARGS
COMMAND FlatStructuringElementTest.py
Ball
5
)
itk_python_add_test(NAME PythonFlatStructuringElementBox
TEST_DRIVER_ARGS
COMMAND FlatStructuringElementTest.py
Box
5
)
itk_python_add_test(NAME PythonGrayscaleDilateImageFilterTest
TEST_DRIVER_ARGS
--compare ${ITK_TEST_OUTPUT_DIR}/PythonGrayscaleDilateImageFilterTest.png
Expand Down
40 changes: 15 additions & 25 deletions ...Python/Tests/notYetUsable/ImageToArray.py → ...hology/test/FlatStructuringElementTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,18 @@
#
#==========================================================================*/

from InsightToolkit import *
from numarray import *
from sys import argv

reader = itkImageFileReaderUC2_New()

connector = itkPyBufferUC2_New()

reader.SetFileName(argv[1])

reader.Update()

print "ready to convert image into array"

buffer = connector.GetArrayFromImage(reader.GetOutput())

writer = itkImageFileWriterUC2_New()

writer.SetFileName(argv[2])

print "ready to convert array into image"

writer.SetInput(connector.GetImageFromArray(buffer))

writer.Update()
from __future__ import print_function

import itk
from sys import argv, exit
itk.auto_progress(2)

if argv[1] == "Ball":
print("Ball")
strel = itk.FlatStructuringElement[2].Ball(int(argv[2]))
elif argv[1] == "Box":
print("Box")
strel = itk.FlatStructuringElement[2].Box(int(argv[2]))
else:
print("invalid arguement: " + argv[1])
exit(1)
83 changes: 7 additions & 76 deletions Wrapping/Generators/Python/Tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,9 @@ endif()
itk_python_add_test(NAME PythonImageIOCoverage COMMAND wrappingCoverage.py -b ImageIO -e ${CMAKE_CURRENT_SOURCE_DIR}/exclude-imageio.txt ${ITK_INCLUDE_DIRS})
itk_python_add_test(NAME PythonTransformCoverage COMMAND wrappingCoverage.py -b Transform -e ${CMAKE_CURRENT_SOURCE_DIR}/exclude-transform.txt ${ITK_INCLUDE_DIRS})

execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy"
RESULT_VARIABLE _have_numpy_return_code
OUTPUT_QUIET
ERROR_QUIET
)

# These two tests can use up all of system memory when the are executed.
# TODO: find the root cause and re-enable them. See ITK-3006 on issues.itk.org.
#itk_python_add_test(PythonFindEmptyClasses findEmptyClasses.py)
if(_have_numpy_return_code EQUAL 0 AND ITK_BUILD_DEFAULT_MODULES)
# Currently unreliably fails. See Issue #96
# itk_python_add_test(NAME PythonGetNameOfClass COMMAND getNameOfClass.py)

itk_python_add_test(NAME PythonTiming COMMAND timing.py)
endif()
itk_python_add_test(NAME PythonFindEmptyClasses COMMAND findEmptyClasses.py)
itk_python_add_test(NAME PythonGetNameOfClass COMMAND getNameOfClass.py)
itk_python_add_test(NAME PythonTiming COMMAND timing.py)
itk_python_add_test(NAME PythonVerifyGetOutputAPIConsistency COMMAND verifyGetOutputAPIConsistency.py)
itk_python_add_test(NAME PythonVerifyTTypeAPIConsistency COMMAND verifyTTypeAPIConsistency.py)
itk_python_add_test(NAME PythonComplex COMMAND complex.py)
Expand All @@ -49,70 +37,13 @@ if(ITK_WRAP_unsigned_char AND WRAP_2)
DATA{${WrapITK_SOURCE_DIR}/images/cthead1.png}
5
)
if(_have_numpy_return_code EQUAL 0)
itk_python_add_test(NAME PythonExtrasTest
COMMAND extras.py
DATA{${WrapITK_SOURCE_DIR}/images/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/out.png ${ITK_TEST_OUTPUT_DIR}
)
endif()
itk_python_add_test(NAME PythonExtrasTest
COMMAND extras.py
DATA{${WrapITK_SOURCE_DIR}/images/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/out.png ${ITK_TEST_OUTPUT_DIR}
)
endif()

# itk_python_add_test(NAME PythonStrelFromImageGrayscaleDilateImageFilter
# StrelFromImageGrayscaleDilateImageFilter.py
# DATA{${WrapITK_SOURCE_DIR}/images/cthead1.png}
# StrelFromImageGrayscaleDilateImageFilter.png
# DATA{${WrapITK_SOURCE_DIR}/images/StrelFromImage.png}
# --compare StrelFromImageGrayscaleDilateImageFilter.png DATA{${WrapITK_SOURCE_DIR}/images/StrelFromImageGrayscaleDilateImageFilter.png}
# )

# itk_python_add_test(NAME PythonFlatStructuringElementBall
# FlatStructuringElement.py
Comment thread
fbudin69500 marked this conversation as resolved.
# Ball-5.png
# Ball
# 5
# --compare Ball-5.png DATA{${WrapITK_SOURCE_DIR}/images/Ball-5.png}
# )

# itk_python_add_test(NAME PythonFlatStructuringElementBox
# FlatStructuringElement.py
# Box-5.png
# Box
# 5
# --compare Box-5.png DATA{${WrapITK_SOURCE_DIR}/images/Box-5.png}
# )

# itk_python_add_test(NAME PythonFlatStructuringElementFromImage
# FlatStructuringElement.py
# StrelFromImage.png
# FromImage
# DATA{${WrapITK_SOURCE_DIR}/images/StrelFromImage.png}
# --compare StrelFromImage.png DATA{${WrapITK_SOURCE_DIR}/images/StrelFromImage.png}
# )
endif()

if(ITK_WRAP_float AND WRAP_2)
# itk_python_add_test(NAME PythonGeodesicActiveContourWhiteMatterTest
# --compare GeodesicActiveContourWhiteMatterTest.png
# DATA{${WrapITK_SOURCE_DIR}/images/GeodesicActiveContourWhiteMatterTest.png}
# --
# GeodesicActiveContourImageFilter.py
# DATA{${WrapITK_SOURCE_DIR}/images/BrainProtonDensitySlice.png}
# GeodesicActiveContourWhiteMatterTest.png
# 56 92 5.0 1.0 -0.3 2.0 10.0
# )

# itk_python_add_test(NAME PythonGeodesicActiveContourGrayMatterTest
# --compare GeodesicActiveContourGrayMatterTest.png
# DATA{${WrapITK_SOURCE_DIR}/images/GeodesicActiveContourGrayMatterTest.png}
# --
# GeodesicActiveContourImageFilter.py
# DATA{${WrapITK_SOURCE_DIR}/images/BrainProtonDensitySlice.png}
# GeodesicActiveContourGrayMatterTest.png
# 40 90 5.0 .5 -0.3 2.0 10.0
# )
endif()


UNIQUE(types "${WRAP_ITK_SCALAR};UC")
# signed char can't be used to store an image with values up to 255
list(REMOVE_ITEM types SC)
Expand Down
53 changes: 0 additions & 53 deletions Wrapping/Generators/Python/Tests/FlatStructuringElement.py
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions Wrapping/Generators/Python/Tests/OldStyleBinaryDilateImageFilter.py
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions Wrapping/Generators/Python/Tests/StrelFromImageGrayscaleDilateImageFilter.py
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Wrapping/Generators/Python/Tests/exclude-filters.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ReconstructionImageFilter
ObjectMorphologyImageFilter
MovingHistogramDilateImageFilter
MovingHistogramErodeImageFilter
MovingHistogramImageFilter
MovingHistogramMorphologicalGradientImageFilter
MovingHistogramMorphologyImageFilter
MorphologyImageFilter
Expand Down Expand Up @@ -37,9 +36,7 @@ MiniPipelineSeparableImageFilter
VanHerkGilWermanDilateImageFilter
VanHerkGilWermanErodeDilateImageFilter
VanHerkGilWermanErodeImageFilter
InterpolateImageFilter
MaskedMovingHistogramImageFilter
MeshToMeshFilter
VectorFuzzyConnectednessImageFilter
WarpJacobianDeterminantFilter
MatrixIndexSelectionImageFilter
Expand Down
Loading