diff --git a/CMakeLists.txt b/CMakeLists.txt index ffcd64f4..bc7d831f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ -cmake_minimum_required(VERSION 3.23) -project(kokkos-fft LANGUAGES CXX) +cmake_minimum_required(VERSION 3.22) +project(KokkosFFT LANGUAGES CXX) # Add cmake helpers for FFTW list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # Options -option(BUILD_EXAMPLES "Build kokkos-fft examples" ON) -option(KokkosFFT_ENABLE_HOST_AND_DEVICE "Enable fft on both host and device" OFF) +option(BUILD_EXAMPLES "Build KokkosFFT examples" ON) +option(KokkosFFT_ENABLE_HOST_AND_DEVICE "Enable FFT on both host and device" OFF) option(KokkosFFT_INTERNAL_Kokkos "Build internal Kokkos instead of relying on external one" OFF) option(KokkosFFT_ENABLE_BENCHMARK "Build benchmarks for KokkosFFT" OFF) @@ -72,7 +72,7 @@ include(GNUInstallDirs) set(LIBDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) set(INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) set(INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${LIBDIR}) -set(KokkosFFT_EXPORT_TARGET "KokkosFFT-Targets") +set(KokkosFFT_EXPORT_TARGET "${PROJECT_NAME}-Targets") add_subdirectory(common) add_subdirectory(fft) diff --git a/cmake/KokkosFFTConfig.cmake.in b/cmake/KokkosFFTConfig.cmake.in index 08a81f44..f6215a43 100644 --- a/cmake/KokkosFFTConfig.cmake.in +++ b/cmake/KokkosFFTConfig.cmake.in @@ -18,6 +18,11 @@ elseif(@Kokkos_ENABLE_HIP@) if(@KokkosFFT_ENABLE_HOST_AND_DEVICE@) find_dependency(FFTW MODULE) endif() +elseif(@Kokkos_ENABLE_SYCL@) + find_dependency(MKL COMPONENTS SYCL) + if(@KokkosFFT_ENABLE_HOST_AND_DEVICE@) + find_dependency(FFTW MODULE) + endif() elseif(@Kokkos_ENABLE_OPENMP@) find_dependency(FFTW MODULE) elseif(@Kokkos_ENABLE_SERIAL@) @@ -26,4 +31,4 @@ endif() include(${KokkosFFT_TARGET_FILE}) -check_required_components(KokkosFFT) \ No newline at end of file +check_required_components(KokkosFFT) diff --git a/install_test/bin/install_cpu.sh b/install_test/bin/install_cpu.sh index f0e4e4bc..b0572b5e 100755 --- a/install_test/bin/install_cpu.sh +++ b/install_test/bin/install_cpu.sh @@ -11,7 +11,7 @@ export Kokkos_DIR=${KOKKOS_INSTALL_PREFIX}/lib/cmake/Kokkos export KOKKOS_BUILD_DIR=build_Kokkos_${TARGET} export KOKKOSFFT_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkosFFT_${TARGET} -export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/kokkos-fft +export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/KokkosFFT export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET} export EXAMPLE_BUILD_DIR=build_example_${TARGET} @@ -45,4 +45,4 @@ if [ $? -eq 0 ]; then else echo "*** install test: build FAILED ***" exit 1; -fi \ No newline at end of file +fi diff --git a/install_test/bin/install_cuda.sh b/install_test/bin/install_cuda.sh index 7efaf85f..8b1404ab 100755 --- a/install_test/bin/install_cuda.sh +++ b/install_test/bin/install_cuda.sh @@ -12,7 +12,7 @@ export Kokkos_DIR=${KOKKOS_INSTALL_PREFIX}/lib/cmake/Kokkos export KOKKOS_BUILD_DIR=build_Kokkos_${KOKKOS_TARGET} export KOKKOSFFT_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkosFFT_${TARGET} -export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/kokkos-fft +export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/KokkosFFT export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET} export EXAMPLE_BUILD_DIR=build_example_${TARGET} @@ -61,4 +61,4 @@ if [ $? -eq 0 ]; then else echo "*** install test: build FAILED ***" exit 1; -fi \ No newline at end of file +fi diff --git a/install_test/bin/install_hip.sh b/install_test/bin/install_hip.sh index 01e8c9fc..34034164 100755 --- a/install_test/bin/install_hip.sh +++ b/install_test/bin/install_hip.sh @@ -12,7 +12,7 @@ export Kokkos_DIR=${KOKKOS_INSTALL_PREFIX}/lib/cmake/Kokkos export KOKKOS_BUILD_DIR=build_Kokkos_${KOKKOS_TARGET} export KOKKOSFFT_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkosFFT_${TARGET} -export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/kokkos-fft +export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/KokkosFFT export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET} export EXAMPLE_BUILD_DIR=build_example_${TARGET} @@ -61,4 +61,4 @@ if [ $? -eq 0 ]; then else echo "*** install test: build FAILED ***" exit 1; -fi \ No newline at end of file +fi