From c055c5c03821e65ba26f67f56427ce8cdeb6ecbc Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Mon, 7 Feb 2022 10:37:04 -0500 Subject: [PATCH 1/3] BUG: Get complex types for conditional wrapping Define `ITK_WRAP_COMPLEX_FLOAT` and `ITK_WRAP_COMPLEX_DOUBLE` from ITK CMake wrapping type list variable for conditionally wrapping FFT filters. --- wrapping/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt index e8d5e518..3a8469a6 100644 --- a/wrapping/CMakeLists.txt +++ b/wrapping/CMakeLists.txt @@ -1,3 +1,13 @@ +set(ITK_WRAP_COMPLEX_FLOAT OFF) +if("CF" IN_LIST WRAP_ITK_COMPLEX_REAL) + set(ITK_WRAP_COMPLEX_FLOAT ON) +endif() + +set(ITK_WRAP_COMPLEX_DOUBLE OFF) +if("CD" IN_LIST WRAP_ITK_COMPLEX_REAL) + set(ITK_WRAP_COMPLEX_DOUBLE ON) +endif() + itk_wrap_module("VkFFTBackend") itk_auto_load_submodules() itk_end_wrap_module() From 0efbd58437d69163a0ccfa862f995ffe196ab971 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Mon, 7 Feb 2022 11:39:15 -0500 Subject: [PATCH 2/3] ENH: Update ITK git tag to v5.3rc03 for GPU CI testing --- .github/workflows/test-gpu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-gpu.yml b/.github/workflows/test-gpu.yml index 762bfa36..515fae8f 100644 --- a/.github/workflows/test-gpu.yml +++ b/.github/workflows/test-gpu.yml @@ -12,7 +12,7 @@ jobs: opencl-headers-git-tag: "v2021.04.29" opencl-version: 120 vkfft-backend: 3 - itk-git-tag: "b1a0a91614dc091f9a17c1e4727095c80e9c05ea" + itk-git-tag: "ddef776afb46a6e135ba3c9f58a0e6e7e4a000be" cmake-build-type: "MinSizeRel" platform-name: "ubuntu-nvidia-gpu" os: ubuntu-20.04 From 4b76eacaa474565ec21f8e782da101773accdc1f Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 8 Feb 2022 09:15:36 -0500 Subject: [PATCH 3/3] BUG: Add path to OpenCL loader DLL for Windows CI --- .github/workflows/build-test-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 1d1ee903..3a86abe3 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -284,7 +284,7 @@ jobs: set PATH="C:\P\grep;%PATH%" set CC=cl.exe set CXX=cl.exe - C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64" --no-cleanup -- "-DOpenCL_INCLUDE_DIR:PATH=${{ github.workspace}}/../OpenCL-ICD-Loader/inc" "-DOpenCL_LIBRARY:FILEPATH=${{ github.workspace}}/../OpenCL-ICD-Loader-build/OpenCL.lib" + C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64" --no-cleanup --lib-paths="${{ github.workspace}}/../OpenCL-ICD-Loader-build" -- "-DOpenCL_INCLUDE_DIR:PATH=${{ github.workspace}}/../OpenCL-ICD-Loader/inc" "-DOpenCL_LIBRARY:FILEPATH=${{ github.workspace}}/../OpenCL-ICD-Loader-build/OpenCL.lib" shell: cmd - name: Publish Python package as GitHub Artifact