Merge pull request #59 from InsightSoftwareConsortium/bump-vkfft

ENH: Bump VkFFT to v1.2.31
InsightSoftwareConsortium · Oct 28, 2022 · 6c06622 · 6c06622
2 parents a17bddb + ed3c449
commit 6c06622
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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 }})

diff --git 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
@@ -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"],