Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/early_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:

cmake \
-D CMAKE_CXX_STANDARD=${{matrix.cxx_version}} \
-D KokkosFFT_ENABLE_HOST_AND_DEVICE=ON \
-D KokkosFFT_ENABLE_FFTW=ON \
-B build \
-S /src/vendor/kokkos-fft
cmake --build build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,13 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: kokkos/kokkos-fft
ref: v0.2.1
ref: v0.3.0
path: kokkos-fft
- name: Install Kokkos-fft
run: |
cmake \
-D CMAKE_CXX_STANDARD=${{matrix.cxx_version}} \
-D KokkosFFT_ENABLE_HOST_AND_DEVICE=ON \
-D KokkosFFT_ENABLE_FFTW=ON \
-B build \
-S ./kokkos-fft
cmake --build build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ jobs:

cmake \
-D CMAKE_CXX_STANDARD=${{matrix.cxx_version}} \
-D KokkosFFT_ENABLE_HOST_AND_DEVICE=ON \
-D KokkosFFT_ENABLE_FFTW=ON \
-B build \
-S /src/vendor/kokkos-fft
cmake --build build
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,15 @@ if("${DDC_BUILD_KERNELS_FFT}")

if("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "AUTO")
if(NOT TARGET KokkosFFT::fft)
find_package(KokkosFFT 0.2.1...<1 QUIET)
find_package(KokkosFFT 0.3.0...<1 QUIET)
if(NOT KokkosFFT_FOUND)
ddc_configure_kokkos_fft()
endif()
endif()
elseif("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED")
ddc_configure_kokkos_fft()
elseif("${DDC_KokkosFFT_DEPENDENCY_POLICY}" STREQUAL "INSTALLED")
find_package(KokkosFFT 0.2.1...<1 REQUIRED)
find_package(KokkosFFT 0.3.0...<1 REQUIRED)
endif()

add_library(ddc_fft INTERFACE)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ To use DDC core, one needs the following dependencies:
To use DDC components, one needs the following dependencies:

* (optional, fft interface) DDC::fft
* Kokkos-fft 0.2.1...<1
* Kokkos-fft 0.3.0...<1
* (optional, IO interface) DDC::pdi
* PDI 1.6...<2
* (optional, spline interpolation) DDC::splines
Expand Down
2 changes: 1 addition & 1 deletion cmake/DDCConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if(NOT TARGET DDC::core)
endif()

if(@DDC_BUILD_KERNELS_FFT@ AND ("fft" IN_LIST DDC_FIND_COMPONENTS))
ddc_find_dependency(KokkosFFT 0.2.1...<1)
ddc_find_dependency(KokkosFFT 0.3.0...<1)

include(${CMAKE_CURRENT_LIST_DIR}/DDCFftTargets.cmake)
if(NOT TARGET DDC::fft)
Expand Down
2 changes: 1 addition & 1 deletion cmake/DDCVendorConfiguration.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ macro(ddc_configure_kokkos)
endmacro()

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

Expand Down
2 changes: 1 addition & 1 deletion vendor/kokkos-fft
Submodule kokkos-fft updated 193 files