From 933862b7f98ba22d9f241222e4bef22500036fb7 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Wed, 26 Oct 2022 14:35:42 -0400 Subject: [PATCH 1/2] ENH: Bump VkFFT to v1.2.31 Bumps VkFFT for performance improvements. Subsequently bumps ITKVkFFTBackend package to v0.1.9. --- CMakeLists.txt | 4 +--- setup.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30713f30..f7141828 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,7 @@ endif() include(FetchContent) add_definitions(-DVKFFT_BACKEND=${VKFFT_BACKEND} -DCL_TARGET_OPENCL_VERSION=120) set(vulkan_GIT_REPOSITORY "https://github.com/DTolm/VkFFT") # original source -set(vulkan_GIT_TAG "3aecc219153f97aaa46e613abbf430033eb27512") -# set(vulkan_GIT_REPOSITORY "https://github.com/Leengit/VkFFT") # Kitware copy of original source -# set(vulkan_GIT_TAG "0c5ddfffe1af9ac96c21d4c38941f9b5481b73c3") +set(vulkan_GIT_TAG "v1.2.31") FetchContent_Declare( vulkan_lib GIT_REPOSITORY ${vulkan_GIT_REPOSITORY} diff --git a/setup.py b/setup.py index 4fe7e735..3c05ff3d 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name="itk-vkfft", - version="0.1.8", + version="0.1.9", author="Insight Software Consortium", author_email="itk+community@discourse.itk.org", packages=["itk"], From ed3c449c197ffc35d1b2ecfc168fb229326e765f Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Fri, 28 Oct 2022 09:36:22 -0400 Subject: [PATCH 2/2] COMP: Ignore VkFFT benchmark compiler warning --- .github/workflows/build-test-package.yml | 2 ++ .github/workflows/test-gpu.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 9b404fbe..a06e2fd6 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -166,6 +166,8 @@ jobs: \${CTEST_CUSTOM_WARNING_EXCEPTION} # macOS Azure VM Warning "ld: warning: text-based stub file" + # VkFFT benchmark warning + "warning: ignoring return value" ) set(dashboard_no_clean 1) set(ENV{CC} ${{ matrix.c-compiler }}) diff --git a/.github/workflows/test-gpu.yml b/.github/workflows/test-gpu.yml index 114fafe6..e1606185 100644 --- a/.github/workflows/test-gpu.yml +++ b/.github/workflows/test-gpu.yml @@ -101,6 +101,8 @@ jobs: \${CTEST_CUSTOM_WARNING_EXCEPTION} # macOS Azure VM Warning "ld: warning: text-based stub file" + # VkFFT benchmark warning + "warning: ignoring return value" ) set(dashboard_no_clean 1) set(ENV{CC} ${{ matrix.c-compiler }})