From 7419f124a95e421572cfcee2370e816017e79196 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 2 Jan 2024 15:35:21 -0500 Subject: [PATCH] Reorder python unit tests to allow the proper implicit dependencies. Signed-off-by: Michael Jackson --- .../02_Image_Segmentation.py | 2 +- .../examples/pipelines/SourceList.cmake | 73 ++++++++++--------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py b/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py index 711166bc3d..20b0d6ae29 100644 --- a/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py +++ b/wrapping/python/examples/pipelines/ITKImageProcessing/02_Image_Segmentation.py @@ -189,4 +189,4 @@ write_xdmf_file=True) nxtest.check_filter_result(filter, result) - print("===> Pipeline Complete") \ No newline at end of file +print("===> Pipeline Complete") diff --git a/wrapping/python/examples/pipelines/SourceList.cmake b/wrapping/python/examples/pipelines/SourceList.cmake index 7242e26953..9181189a3b 100644 --- a/wrapping/python/examples/pipelines/SourceList.cmake +++ b/wrapping/python/examples/pipelines/SourceList.cmake @@ -1,40 +1,4 @@ -#------------------------------------------------------------------------------ -# Add the examples/Pipelines/Complex folder -#------------------------------------------------------------------------------ -set(PYTHON_TEST_INPUT_DIR "${simplnx_SOURCE_DIR}/wrapping/python/examples/pipelines/Complex") - -set(SIMPLNX_PYTHON_TESTS - AlignSectionsMutualInformation - AppendImageGeometryZSlice - ApplyTransformation_Demo - ApplyTransformation_Image - ApplyTransformation_Node - ArrayCalculatorExample - AvizoWriters - CombineSTLFiles - EnsembleInfoReader - FindBiasedFeatures - FindBoundaryCells - FindLargestCrossSections - Import_ASCII - Import_CSV_Data - Import_STL_Model - ReplaceElementAttributesWithNeighbor - ResamplePorosityImage - ResampleRectGridToImageGeom - SurfaceNets_Demo - Triangle_Face_Data_Demo - VtkRectilinearGridWriter -) - -CreatePythonTests(PREFIX "PY::SimplnxCore" - INPUT_DIR ${PYTHON_TEST_INPUT_DIR} - TEST_NAMES ${SIMPLNX_PYTHON_TESTS} -) - - - #------------------------------------------------------------------------------ # Add the examples/pipelines/ITKImageProcessing folder #------------------------------------------------------------------------------ @@ -84,4 +48,41 @@ CreatePythonTests(PREFIX "PY::OrientationAnalysis" ) +#------------------------------------------------------------------------------ +# Add the examples/Pipelines/Complex folder +# +# These are going last because there are pipelines in here that depend on +# output files that are generated in the other plugins. +#------------------------------------------------------------------------------ +set(PYTHON_TEST_INPUT_DIR "${simplnx_SOURCE_DIR}/wrapping/python/examples/pipelines/Complex") + +set(SIMPLNX_PYTHON_TESTS + AlignSectionsMutualInformation + AppendImageGeometryZSlice + ApplyTransformation_Demo + ApplyTransformation_Image + ApplyTransformation_Node + ArrayCalculatorExample + AvizoWriters + CombineSTLFiles + EnsembleInfoReader + FindBiasedFeatures + FindBoundaryCells + FindLargestCrossSections + Import_ASCII + Import_CSV_Data + Import_STL_Model + ReplaceElementAttributesWithNeighbor + ResamplePorosityImage + ResampleRectGridToImageGeom + SurfaceNets_Demo + Triangle_Face_Data_Demo + VtkRectilinearGridWriter +) + +CreatePythonTests(PREFIX "PY::SimplnxCore" + INPUT_DIR ${PYTHON_TEST_INPUT_DIR} + TEST_NAMES ${SIMPLNX_PYTHON_TESTS} +) +