From 71f173f7cd6f2c6aa716cb35129f63a182b4f767 Mon Sep 17 00:00:00 2001 From: Thomas Padioleau Date: Mon, 7 Oct 2024 22:16:58 +0200 Subject: [PATCH] Use version 0.2.1 --- CMakeLists.txt | 4 ++-- cmake/DDCConfig.cmake.in | 2 +- vendor/kokkos-fft | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ec477e10..50bca60fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,7 @@ if("${DDC_BUILD_KERNELS_FFT}") if("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "AUTO") if(NOT TARGET KokkosFFT::fft) - find_package(KokkosFFT 0.2 CONFIG QUIET) + find_package(KokkosFFT 0.2.1...<2 CONFIG QUIET) if(NOT KokkosFFT_FOUND) option(KokkosFFT_ENABLE_HOST_AND_DEVICE "Enable FFT on both host and device" ON) add_subdirectory(vendor/kokkos-fft) @@ -183,7 +183,7 @@ if("${DDC_BUILD_KERNELS_FFT}") option(KokkosFFT_ENABLE_HOST_AND_DEVICE "Enable FFT on both host and device" ON) add_subdirectory(vendor/kokkos-fft) elseif("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "INSTALLED") - find_package(KokkosFFT 0.2 CONFIG REQUIRED) + find_package(KokkosFFT 0.2.1...<2 CONFIG REQUIRED) endif() target_link_libraries(DDC INTERFACE KokkosFFT::fft) diff --git a/cmake/DDCConfig.cmake.in b/cmake/DDCConfig.cmake.in index 36122096c..83b35213c 100644 --- a/cmake/DDCConfig.cmake.in +++ b/cmake/DDCConfig.cmake.in @@ -7,7 +7,7 @@ include(CMakeFindDependencyMacro) if(@DDC_BUILD_KERNELS_FFT@) - find_dependency(KokkosFFT 0.2 CONFIG REQUIRED) + find_dependency(KokkosFFT 0.2.1...<2 CONFIG REQUIRED) endif() if(@DDC_BUILD_PDI_WRAPPER@) diff --git a/vendor/kokkos-fft b/vendor/kokkos-fft index 545dc6984..b460f187a 160000 --- a/vendor/kokkos-fft +++ b/vendor/kokkos-fft @@ -1 +1 @@ -Subproject commit 545dc698497c6f41d153092cb28f2251e5a29ba2 +Subproject commit b460f187a309a392766031e8e231e80e4b9a6c7c