From 162bc9983b9453342d43af2ec4f2bc7992ce57ee Mon Sep 17 00:00:00 2001 From: David Allemang Date: Wed, 18 Sep 2024 12:17:00 -0400 Subject: [PATCH] CI: Fix Ubuntu GitHub Action (#12) * Disable manylinux-2014 * Revert "Disable manylinux-2014" This reverts commit 3cdf0650324e49e23abd4571583f13765fabbd8c. * Set HalideFilters linker language * COMP: Do not test GPU filter by default. * CI: Disable manylinux python packages * Revert "CI: Disable manylinux python packages" This reverts commit 612517f98be99eae32636e1814a3012fd440ae9d. * CI: Disable python build workflow --- .github/workflows/build-test-package.yml | 8 ++++---- CMakeLists.txt | 1 + src/CMakeLists.txt | 1 + test/CMakeLists.txt | 20 +++++++++++--------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index c4f9940..89e7f5e 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -14,7 +14,7 @@ jobs: cxx-build-workflow: uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0 - python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 - secrets: - pypi_password: ${{ secrets.pypi_password }} +# python-build-workflow: +# uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 +# secrets: +# pypi_password: ${{ secrets.pypi_password }} diff --git a/CMakeLists.txt b/CMakeLists.txt index aff18ce..eaf20f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) option(Module_HalideFilters_USE_AUTOSCHEDULER "Use auto-schedulers for Halide filters" OFF) +option(Module_HalideFilters_TEST_GPU "Run GPU tests" OFF) # Update the following variables to update the version of Halide used set(HALIDE_VERSION "18.0.0") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b160e5..b73734e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,3 +45,4 @@ set(HalideFilters_SRCS itk_module_add_library(HalideFilters ${HalideFilters_SRCS}) target_include_directories(HalideFilters PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(HalideFilters PUBLIC itkHalideSeparableConvolutionImpl itkHalideGPUSeparableConvolutionImpl) +set_target_properties(HalideFilters PROPERTIES LINKER_LANGUAGE CXX) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7690d1a..dea4b6d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -19,12 +19,14 @@ itk_add_test(NAME itkHalideDiscreteGaussianImageFilterTest 9 ) -itk_add_test(NAME itkHalideGPUDiscreteGaussianImageFilterTest - COMMAND - HalideFiltersTestDriver - --compare DATA{CTChest/ReferenceOutput.mha} ${ITK_TEST_OUTPUT_DIR}/Output.mha - itkHalideGPUDiscreteGaussianImageFilterTest - DATA{CTChest/Input.mha} - ${ITK_TEST_OUTPUT_DIR}/Output.mha - 9 - ) +if(Module_HalideFilters_TEST_GPU) + itk_add_test(NAME itkHalideGPUDiscreteGaussianImageFilterTest + COMMAND + HalideFiltersTestDriver + --compare DATA{CTChest/ReferenceOutput.mha} ${ITK_TEST_OUTPUT_DIR}/Output.mha + itkHalideGPUDiscreteGaussianImageFilterTest + DATA{CTChest/Input.mha} + ${ITK_TEST_OUTPUT_DIR}/Output.mha + 9 + ) +endif() \ No newline at end of file