Skip to content

Commit 646cb88

Browse files
authored
Update minimum required of kokkos-fft (#880)
1 parent f2a142a commit 646cb88

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

.github/workflows/early_integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
166166
cmake \
167167
-D CMAKE_CXX_STANDARD=${{matrix.cxx_version}} \
168-
-D KokkosFFT_ENABLE_HOST_AND_DEVICE=ON \
168+
-D KokkosFFT_ENABLE_FFTW=ON \
169169
-B build \
170170
-S /src/vendor/kokkos-fft
171171
cmake --build build

.github/workflows/tests-macos.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,13 @@ jobs:
158158
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
159159
with:
160160
repository: kokkos/kokkos-fft
161-
ref: v0.2.1
161+
ref: v0.3.0
162162
path: kokkos-fft
163163
- name: Install Kokkos-fft
164164
run: |
165165
cmake \
166166
-D CMAKE_CXX_STANDARD=${{matrix.cxx_version}} \
167-
-D KokkosFFT_ENABLE_HOST_AND_DEVICE=ON \
167+
-D KokkosFFT_ENABLE_FFTW=ON \
168168
-B build \
169169
-S ./kokkos-fft
170170
cmake --build build

.github/workflows/tests-ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ jobs:
311311
312312
cmake \
313313
-D CMAKE_CXX_STANDARD=${{matrix.cxx_version}} \
314-
-D KokkosFFT_ENABLE_HOST_AND_DEVICE=ON \
314+
-D KokkosFFT_ENABLE_FFTW=ON \
315315
-B build \
316316
-S /src/vendor/kokkos-fft
317317
cmake --build build

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,15 @@ if("${DDC_BUILD_KERNELS_FFT}")
154154

155155
if("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "AUTO")
156156
if(NOT TARGET KokkosFFT::fft)
157-
find_package(KokkosFFT 0.2.1...<1 QUIET)
157+
find_package(KokkosFFT 0.3.0...<1 QUIET)
158158
if(NOT KokkosFFT_FOUND)
159159
ddc_configure_kokkos_fft()
160160
endif()
161161
endif()
162162
elseif("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED")
163163
ddc_configure_kokkos_fft()
164164
elseif("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "INSTALLED")
165-
find_package(KokkosFFT 0.2.1...<1 REQUIRED)
165+
find_package(KokkosFFT 0.3.0...<1 REQUIRED)
166166
endif()
167167

168168
add_library(ddc_fft INTERFACE)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ To use DDC core, one needs the following dependencies:
4747
To use DDC components, one needs the following dependencies:
4848

4949
* (optional, fft interface) DDC::fft
50-
* Kokkos-fft 0.2.1...<1
50+
* Kokkos-fft 0.3.0...<1
5151
* (optional, IO interface) DDC::pdi
5252
* PDI 1.6...<2
5353
* (optional, spline interpolation) DDC::splines

cmake/DDCConfig.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if(NOT TARGET DDC::core)
4242
endif()
4343

4444
if(@DDC_BUILD_KERNELS_FFT@ AND ("fft" IN_LIST DDC_FIND_COMPONENTS))
45-
ddc_find_dependency(KokkosFFT 0.2.1...<1)
45+
ddc_find_dependency(KokkosFFT 0.3.0...<1)
4646

4747
include(${CMAKE_CURRENT_LIST_DIR}/DDCFftTargets.cmake)
4848
if(NOT TARGET DDC::fft)

cmake/DDCVendorConfiguration.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ macro(ddc_configure_kokkos)
4343
endmacro()
4444

4545
macro(ddc_configure_kokkos_fft)
46-
option(KokkosFFT_ENABLE_HOST_AND_DEVICE "Enable FFT on both host and device" ON)
46+
option(KokkosFFT_ENABLE_FFTW "Enable fftw as a KokkosFFT backend on CPUs" ON)
4747
add_subdirectory(vendor/kokkos-fft)
4848
endmacro()
4949

vendor/kokkos-fft

Submodule kokkos-fft updated 193 files

0 commit comments

Comments
 (0)