From b081074ce84fed29f90c42007ba49e51aaddcdba Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Tue, 9 Jan 2024 18:34:27 +0900
Subject: [PATCH 01/14] Adding install capability (issue with Finding Kokkos)

---
 CMakeLists.txt                 | 41 +++++++++++++++++++++++++++++--
 cmake/KokkosFFTConfig.cmake.in |  8 +++++++
 common/src/CMakeLists.txt      |  5 +++-
 fft/src/CMakeLists.txt         |  5 +++-
 install_test/CMakeLists.txt    |  8 +++++++
 install_test/main.cpp          | 44 ++++++++++++++++++++++++++++++++++
 6 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 cmake/KokkosFFTConfig.cmake.in
 create mode 100644 install_test/CMakeLists.txt
 create mode 100644 install_test/main.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd7649fe..e8d809d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,10 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_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(KokkosFFT_ENABLE_INSTALL_TEST "Enable install test" ON)
 
 find_package(Kokkos CONFIG)
-if(NOT kokkos_FOUND)
+if(NOT Kokkos_FOUND)
     add_subdirectory(tpls/kokkos)
 endif()
 
@@ -22,8 +23,44 @@ if(BUILD_TESTING)
     endif()
 endif()
 
+# Set directories used for install
+include(GNUInstallDirs)
+set(INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+set(INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+
 add_subdirectory(common)
 add_subdirectory(fft)
 if(BUILD_EXAMPLES)
     add_subdirectory(examples)
-endif()
\ No newline at end of file
+endif()
+
+# Installation
+install(
+    TARGETS common fft
+    EXPORT KokkosFFT-targets
+)
+
+install(
+    EXPORT KokkosFFT-targets
+    DESTINATION ${INSTALL_INCLUDEDIR}
+)
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/common/
+    DESTINATION ${INSTALL_INCLUDEDIR}
+)
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fft/
+    DESTINATION ${INSTALL_INCLUDEDIR}
+)
+
+configure_package_config_file(cmake/KokkosFFTConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfig.cmake
+    INSTALL_DESTINATION ${INSTALL_INCLUDEDIR}
+)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfig.cmake
+    DESTINATION ${INSTALL_INCLUDEDIR}
+)
\ No newline at end of file
diff --git a/cmake/KokkosFFTConfig.cmake.in b/cmake/KokkosFFTConfig.cmake.in
new file mode 100644
index 00000000..7d1132a4
--- /dev/null
+++ b/cmake/KokkosFFTConfig.cmake.in
@@ -0,0 +1,8 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(Kokkos)
+
+include(${CMAKE_CURRENT_LIST_DIR}/KokkosFFT-targets.cmake)
+
+check_required_components(KokkosFFT)
\ No newline at end of file
diff --git a/common/src/CMakeLists.txt b/common/src/CMakeLists.txt
index 9f59f4d3..d5682f0d 100644
--- a/common/src/CMakeLists.txt
+++ b/common/src/CMakeLists.txt
@@ -30,4 +30,7 @@ elseif(Kokkos_ENABLE_SERIAL)
 endif()
 
 target_compile_features(common INTERFACE cxx_std_17)
-target_include_directories(common INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
\ No newline at end of file
+target_include_directories(common INTERFACE
+                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                           $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
+)
\ No newline at end of file
diff --git a/fft/src/CMakeLists.txt b/fft/src/CMakeLists.txt
index 7d5a7e1f..a79f21f5 100644
--- a/fft/src/CMakeLists.txt
+++ b/fft/src/CMakeLists.txt
@@ -6,5 +6,8 @@ target_link_libraries(fft
     Kokkos::kokkos
 )
 
-target_include_directories(fft INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(fft INTERFACE
+                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                           $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
+)
 add_library(Kokkos::fft ALIAS fft)
\ No newline at end of file
diff --git a/install_test/CMakeLists.txt b/install_test/CMakeLists.txt
new file mode 100644
index 00000000..05f30b3e
--- /dev/null
+++ b/install_test/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.21)
+project(install-test LANGUAGES CXX)
+
+find_package(KokkosFFT CONFIG REQUIRED)
+
+add_executable(install-test main.cpp)
+target_compile_features(install-test PUBLIC cxx_std_17)
+target_link_libraries(install-test PUBLIC Kokkos::fft)
\ No newline at end of file
diff --git a/install_test/main.cpp b/install_test/main.cpp
new file mode 100644
index 00000000..a7117df9
--- /dev/null
+++ b/install_test/main.cpp
@@ -0,0 +1,44 @@
+#include <Kokkos_Core.hpp>
+#include <Kokkos_Complex.hpp>
+#include <Kokkos_Random.hpp>
+#include <KokkosFFT.hpp>
+
+using execution_space = Kokkos::DefaultExecutionSpace;
+template <typename T>
+using View1D = Kokkos::View<T*, execution_space>;
+
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
+  {
+    constexpr int n0 = 128;
+    const Kokkos::complex<double> I(1.0, 1.0);
+
+    // 1D C2C FFT (Forward and Backward)
+    View1D<Kokkos::complex<double> > xc2c("xc2c", n0);
+    View1D<Kokkos::complex<double> > xc2c_hat("xc2c_hat", n0);
+    View1D<Kokkos::complex<double> > xc2c_inv("xc2c_inv", n0);
+
+    Kokkos::Random_XorShift64_Pool<> random_pool(12345);
+    Kokkos::fill_random(xc2c, random_pool, I);
+
+    KokkosFFT::fft(execution_space(), xc2c, xc2c_hat);
+    KokkosFFT::ifft(execution_space(), xc2c_hat, xc2c_inv);
+
+    // 1D R2C FFT
+    View1D<double> xr2c("xr2c", n0);
+    View1D<Kokkos::complex<double> > xr2c_hat("xr2c_hat", n0 / 2 + 1);
+    Kokkos::fill_random(xr2c, random_pool, 1);
+
+    KokkosFFT::rfft(execution_space(), xr2c, xr2c_hat);
+
+    // 1D C2R FFT
+    View1D<Kokkos::complex<double> > xc2r("xr2c_hat", n0 / 2 + 1);
+    View1D<double> xc2r_hat("xc2r", n0);
+    Kokkos::fill_random(xc2r, random_pool, I);
+
+    KokkosFFT::irfft(execution_space(), xc2r, xc2r_hat);
+  }
+  Kokkos::finalize();
+
+  return 0;
+}
\ No newline at end of file

From 3358d48386e4f04bd45d9589de7d1eb941ed3ba1 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Wed, 10 Jan 2024 17:51:57 +0900
Subject: [PATCH 02/14] Avoid Kokkos as a namespace

---
 examples/01_1DFFT/CMakeLists.txt             | 2 +-
 examples/02_2DFFT/CMakeLists.txt             | 2 +-
 examples/03_NDFFT/CMakeLists.txt             | 2 +-
 examples/04_batchedFFT/CMakeLists.txt        | 2 +-
 examples/05_1DFFT_HOST_DEVICE/CMakeLists.txt | 2 +-
 examples/06_1DFFT_reuse_plans/CMakeLists.txt | 2 +-
 fft/src/CMakeLists.txt                       | 2 +-
 fft/unit_test/CMakeLists.txt                 | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/01_1DFFT/CMakeLists.txt b/examples/01_1DFFT/CMakeLists.txt
index 19aa79a5..1040afde 100644
--- a/examples/01_1DFFT/CMakeLists.txt
+++ b/examples/01_1DFFT/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(01_1DFFT 01_1DFFT.cpp)
-target_link_libraries(01_1DFFT PUBLIC Kokkos::fft)
\ No newline at end of file
+target_link_libraries(01_1DFFT PUBLIC KokkosFFT::fft)
\ No newline at end of file
diff --git a/examples/02_2DFFT/CMakeLists.txt b/examples/02_2DFFT/CMakeLists.txt
index 18c7d096..740eced1 100644
--- a/examples/02_2DFFT/CMakeLists.txt
+++ b/examples/02_2DFFT/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(02_2DFFT 02_2DFFT.cpp)
-target_link_libraries(02_2DFFT PUBLIC Kokkos::fft)
\ No newline at end of file
+target_link_libraries(02_2DFFT PUBLIC KokkosFFT::fft)
\ No newline at end of file
diff --git a/examples/03_NDFFT/CMakeLists.txt b/examples/03_NDFFT/CMakeLists.txt
index 0dac1239..2dd0080b 100644
--- a/examples/03_NDFFT/CMakeLists.txt
+++ b/examples/03_NDFFT/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(03_NDFFT 03_NDFFT.cpp)
-target_link_libraries(03_NDFFT PUBLIC Kokkos::fft)
\ No newline at end of file
+target_link_libraries(03_NDFFT PUBLIC KokkosFFT::fft)
\ No newline at end of file
diff --git a/examples/04_batchedFFT/CMakeLists.txt b/examples/04_batchedFFT/CMakeLists.txt
index 5fe03b30..be851125 100644
--- a/examples/04_batchedFFT/CMakeLists.txt
+++ b/examples/04_batchedFFT/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(04_batchedFFT 04_batchedFFT.cpp)
-target_link_libraries(04_batchedFFT PUBLIC Kokkos::fft)
\ No newline at end of file
+target_link_libraries(04_batchedFFT PUBLIC KokkosFFT::fft)
\ No newline at end of file
diff --git a/examples/05_1DFFT_HOST_DEVICE/CMakeLists.txt b/examples/05_1DFFT_HOST_DEVICE/CMakeLists.txt
index c94d84f7..5baa8e2e 100644
--- a/examples/05_1DFFT_HOST_DEVICE/CMakeLists.txt
+++ b/examples/05_1DFFT_HOST_DEVICE/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(05_1DFFT_HOST_DEVICE 05_1DFFT_HOST_DEVICE.cpp)
-target_link_libraries(05_1DFFT_HOST_DEVICE PUBLIC Kokkos::fft)
\ No newline at end of file
+target_link_libraries(05_1DFFT_HOST_DEVICE PUBLIC KokkosFFT::fft)
\ No newline at end of file
diff --git a/examples/06_1DFFT_reuse_plans/CMakeLists.txt b/examples/06_1DFFT_reuse_plans/CMakeLists.txt
index 61ec93eb..4eae3c65 100644
--- a/examples/06_1DFFT_reuse_plans/CMakeLists.txt
+++ b/examples/06_1DFFT_reuse_plans/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(06_1DFFT_reuse_plans 06_1DFFT_reuse_plans.cpp)
-target_link_libraries(06_1DFFT_reuse_plans PUBLIC Kokkos::fft)
\ No newline at end of file
+target_link_libraries(06_1DFFT_reuse_plans PUBLIC KokkosFFT::fft)
\ No newline at end of file
diff --git a/fft/src/CMakeLists.txt b/fft/src/CMakeLists.txt
index a79f21f5..269380bf 100644
--- a/fft/src/CMakeLists.txt
+++ b/fft/src/CMakeLists.txt
@@ -10,4 +10,4 @@ target_include_directories(fft INTERFACE
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
                            $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
 )
-add_library(Kokkos::fft ALIAS fft)
\ No newline at end of file
+add_library(KokkosFFT::fft ALIAS fft)
\ No newline at end of file
diff --git a/fft/unit_test/CMakeLists.txt b/fft/unit_test/CMakeLists.txt
index 8582f118..eda9bcc6 100644
--- a/fft/unit_test/CMakeLists.txt
+++ b/fft/unit_test/CMakeLists.txt
@@ -2,13 +2,13 @@ add_executable(unit-tests-kokkos-fft-core
     Test_Main.cpp
     Test_Plans.cpp
     Test_Transform.cpp
-    Test_Helpers.cpp 
+    Test_Helpers.cpp
 )
 
 target_compile_features(unit-tests-kokkos-fft-core PUBLIC cxx_std_17)
 target_compile_options(unit-tests-kokkos-fft-core PUBLIC -std=c++17)
 
-target_link_libraries(unit-tests-kokkos-fft-core PUBLIC Kokkos::fft GTest::gtest)
+target_link_libraries(unit-tests-kokkos-fft-core PUBLIC KokkosFFT::fft GTest::gtest)
 
 # Enable GoogleTest
 include(GoogleTest)

From d7240ad69dbe5b114b15bbfb9d21394ddb0d21c4 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Wed, 10 Jan 2024 17:53:27 +0900
Subject: [PATCH 03/14] Add dependency to FFTW

---
 CMakeLists.txt                 | 27 +++++++++++++++++++--------
 cmake/KokkosFFTConfig.cmake.in | 23 ++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8d809d0..b87bb621 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,13 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_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(KokkosFFT_ENABLE_INSTALL_TEST "Enable install test" ON)
+option(KokkosFFT_INTERNAL_Kokkos  "Build internal Kokkos instead of relying on external one" OFF)
 
-find_package(Kokkos CONFIG)
-if(NOT Kokkos_FOUND)
+if (NOT KokkosFFT_INTERNAL_Kokkos)
+    find_package(Kokkos REQUIRED)
+else ()
     add_subdirectory(tpls/kokkos)
-endif()
+endif ()
 
 # Googletest
 include(CTest)
@@ -35,6 +36,8 @@ if(BUILD_EXAMPLES)
 endif()
 
 # Installation
+include(CMakePackageConfigHelpers)
+
 install(
     TARGETS common fft
     EXPORT KokkosFFT-targets
@@ -42,25 +45,33 @@ install(
 
 install(
     EXPORT KokkosFFT-targets
+    NAMESPACE KokkosFFT::
     DESTINATION ${INSTALL_INCLUDEDIR}
 )
 
 install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/common/
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/common/src/ ${CMAKE_CURRENT_SOURCE_DIR}/fft/src/
     DESTINATION ${INSTALL_INCLUDEDIR}
 )
 
 install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fft/
+    FILES ${CMAKE_SOURCE_DIR}/cmake/FindFFTW.cmake
     DESTINATION ${INSTALL_INCLUDEDIR}
 )
 
 configure_package_config_file(cmake/KokkosFFTConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfig.cmake
-    INSTALL_DESTINATION ${INSTALL_INCLUDEDIR}
+    INSTALL_DESTINATION ${INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
+
+write_basic_package_version_file(
+    ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfigVersion.cmake
+    VERSION 0.0.0
+    COMPATIBILITY SameMajorVersion
 )
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfig.cmake
-    DESTINATION ${INSTALL_INCLUDEDIR}
+          ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfigVersion.cmake
+    DESTINATION ${INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
\ No newline at end of file
diff --git a/cmake/KokkosFFTConfig.cmake.in b/cmake/KokkosFFTConfig.cmake.in
index 7d1132a4..5565efb6 100644
--- a/cmake/KokkosFFTConfig.cmake.in
+++ b/cmake/KokkosFFTConfig.cmake.in
@@ -1,8 +1,29 @@
 @PACKAGE_INIT@
 
+# Set and Check must go first else macro might be redefined by find_dependency ...
+set_and_check(KokkosFFT_TARGET_FILE
+"${PACKAGE_PREFIX_DIR}/include/KokkosFFT-targets.cmake")
+
 include(CMakeFindDependencyMacro)
+list(INSERT CMAKE_MODULE_PATH 0 "${PACKAGE_PREFIX_DIR}/include")
 find_dependency(Kokkos)
 
-include(${CMAKE_CURRENT_LIST_DIR}/KokkosFFT-targets.cmake)
+if(@Kokkos_ENABLE_CUDA@)
+   find_dependency(CUDAToolkit COMPONENTS cufft)
+   if(@KokkosFFT_ENABLE_HOST_AND_DEVICE@)
+      find_dependency(FFTW MODULE)
+   endif()
+elseif(@Kokkos_ENABLE_HIP@)
+   find_dependency(hipfft)
+   if(@KokkosFFT_ENABLE_HOST_AND_DEVICE@)
+      find_dependency(FFTW MODULE)
+   endif()
+elseif(@Kokkos_ENABLE_OPENMP@)
+   find_dependency(FFTW MODULE)
+elseif(@Kokkos_ENABLE_SERIAL@)
+   find_dependency(FFTW MODULE)
+endif()
+
+include(${KokkosFFT_TARGET_FILE})
 
 check_required_components(KokkosFFT)
\ No newline at end of file

From f8baa9eb0556936fd99770a65fd68dbe9131e7aa Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Wed, 10 Jan 2024 17:54:18 +0900
Subject: [PATCH 04/14] explictly link Kokkos

---
 install_test/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install_test/CMakeLists.txt b/install_test/CMakeLists.txt
index 05f30b3e..ba9532d8 100644
--- a/install_test/CMakeLists.txt
+++ b/install_test/CMakeLists.txt
@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.21)
 project(install-test LANGUAGES CXX)
 
+find_package(Kokkos CONFIG REQUIRED)
 find_package(KokkosFFT CONFIG REQUIRED)
 
 add_executable(install-test main.cpp)
 target_compile_features(install-test PUBLIC cxx_std_17)
-target_link_libraries(install-test PUBLIC Kokkos::fft)
\ No newline at end of file
+target_link_libraries(install-test PUBLIC Kokkos::kokkos KokkosFFT::fft)
\ No newline at end of file

From 1eeecc37098a4a1eae4f243ff8386f9f47247fac Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Wed, 10 Jan 2024 18:06:15 +0900
Subject: [PATCH 05/14] Use internal kokkos for actions

---
 .github/workflows/cmake.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 4fc7f865..96ab2637 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -54,7 +54,7 @@ jobs:
       run: |
           docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_OPENMP \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=g++ \
-            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_OPENMP=ON -DBUILD_TESTING=ON
+            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_OPENMP=ON -DBUILD_TESTING=ON -KokkosFFT_INTERNAL_Kokkos=ON
 
     - name: Configure CMake for CUDA backend
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -62,7 +62,7 @@ jobs:
       run: |
           docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_CUDA \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=${{env.CMAKE_CXX_COMPILER}} \
-            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_${{env.CUDA_ARCHITECTURES}}=ON -DBUILD_TESTING=ON
+            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_${{env.CUDA_ARCHITECTURES}}=ON -DBUILD_TESTING=ON -KokkosFFT_INTERNAL_Kokkos=ON
 
     - name: Configure CMake for CUDA backend with HOST and DEVICE option
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -71,7 +71,7 @@ jobs:
           docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_CUDA_HOST_DEVICE \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=${{env.CMAKE_CXX_COMPILER}} \
             -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_${{env.CUDA_ARCHITECTURES}}=ON -DBUILD_TESTING=ON \
-            -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON
+            -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON -KokkosFFT_INTERNAL_Kokkos=ON
 
     - name: Build
       # Build your program with the given configuration
@@ -123,7 +123,7 @@ jobs:
       run: |
         docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_${{matrix.backend.name}} \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=${{env.CMAKE_CXX_COMPILER}} \
-            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_${{env.architecture}}=ON -DBUILD_TESTING=ON ${{matrix.backend.option}}
+            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -KokkosFFT_INTERNAL_Kokkos=ON -DKokkos_ARCH_${{env.architecture}}=ON -DBUILD_TESTING=ON ${{matrix.backend.option}}
 
     - name: Build
       # Build your program with the given configuration

From 28e3d9f32c6f13699ec9dfd4b664fafd618c2313 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Wed, 10 Jan 2024 18:18:08 +0900
Subject: [PATCH 06/14] Add missing D in configure options

---
 .github/workflows/cmake.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 96ab2637..f50cfa2b 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -54,7 +54,7 @@ jobs:
       run: |
           docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_OPENMP \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=g++ \
-            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_OPENMP=ON -DBUILD_TESTING=ON -KokkosFFT_INTERNAL_Kokkos=ON
+            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_OPENMP=ON -DBUILD_TESTING=ON -DKokkosFFT_INTERNAL_Kokkos=ON
 
     - name: Configure CMake for CUDA backend
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -62,7 +62,7 @@ jobs:
       run: |
           docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_CUDA \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=${{env.CMAKE_CXX_COMPILER}} \
-            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_${{env.CUDA_ARCHITECTURES}}=ON -DBUILD_TESTING=ON -KokkosFFT_INTERNAL_Kokkos=ON
+            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_${{env.CUDA_ARCHITECTURES}}=ON -DBUILD_TESTING=ON -DKokkosFFT_INTERNAL_Kokkos=ON
 
     - name: Configure CMake for CUDA backend with HOST and DEVICE option
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -71,7 +71,7 @@ jobs:
           docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_CUDA_HOST_DEVICE \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=${{env.CMAKE_CXX_COMPILER}} \
             -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_${{env.CUDA_ARCHITECTURES}}=ON -DBUILD_TESTING=ON \
-            -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON -KokkosFFT_INTERNAL_Kokkos=ON
+            -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON -DKokkosFFT_INTERNAL_Kokkos=ON
 
     - name: Build
       # Build your program with the given configuration
@@ -123,7 +123,7 @@ jobs:
       run: |
         docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake -B build_${{matrix.backend.name}} \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=${{env.CMAKE_CXX_COMPILER}} \
-            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -KokkosFFT_INTERNAL_Kokkos=ON -DKokkos_ARCH_${{env.architecture}}=ON -DBUILD_TESTING=ON ${{matrix.backend.option}}
+            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkosFFT_INTERNAL_Kokkos=ON -DKokkos_ARCH_${{env.architecture}}=ON -DBUILD_TESTING=ON ${{matrix.backend.option}}
 
     - name: Build
       # Build your program with the given configuration

From c924d04b1732807b50351e5deee3aa84b5804ea6 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Fri, 19 Jan 2024 18:36:56 +0900
Subject: [PATCH 07/14] CI for installation on CPUs

---
 .github/workflows/cmake.yml           |  4 +++
 install_test/bin/install_cpu.sh       | 48 +++++++++++++++++++++++++++
 install_test/{ => src}/CMakeLists.txt |  2 ++
 install_test/{ => src}/main.cpp       |  0
 4 files changed, 54 insertions(+)
 create mode 100755 install_test/bin/install_cpu.sh
 rename install_test/{ => src}/CMakeLists.txt (84%)
 rename install_test/{ => src}/main.cpp (100%)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index f50cfa2b..91498470 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -84,6 +84,10 @@ jobs:
       # Execute tests defined by the CMake configuration. Testing on CPUs only
       run: |
         docker run -v ${{github.workspace}}:/work ${{ env.container }} ctest --output-on-failure --test-dir build_OPENMP -C ${{env.BUILD_TYPE}}
+        
+    - name: Install test on CPUs
+        run: |
+          docker run -v ${{github.workspace}}:/work ${{ env.container }} ./install_test/bin/install_cpu.sh /tmp
 
   build_amd:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
diff --git a/install_test/bin/install_cpu.sh b/install_test/bin/install_cpu.sh
new file mode 100755
index 00000000..b02d0b65
--- /dev/null
+++ b/install_test/bin/install_cpu.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+args=$#
+ROOT_DIR=$1
+WK_DIR=$(pwd)
+TARGET="cpu"
+
+# Install Kokkos
+export KOKKOS_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkos_${TARGET}
+export Kokkos_DIR=${KOKKOS_INSTALL_PREFIX}/lib64/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}/lib64/cmake/kokkos-fft
+export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET}
+
+export EXAMPLE_BUILD_DIR=build_example_${TARGET}
+
+# Install Kokkos
+cd ${WK_DIR}
+mkdir ${KOKKOS_BUILD_DIR} && cd ${KOKKOS_BUILD_DIR}
+
+# Get Kokkos from github repo and build
+git clone https://github.com/kokkos/kokkos.git
+cmake -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DKokkos_ENABLE_OPENMP=ON -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} kokkos
+cmake --build . -j 8
+cmake --install .
+
+# Install KokkosFFT
+cd ${WK_DIR}
+mkdir ${KOKKOSFFT_BUILD_DIR} && cd ${KOKKOSFFT_BUILD_DIR}
+cmake -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DKokkos_ENABLE_OPENMP=ON -DCMAKE_INSTALL_PREFIX=${KOKKOSFFT_INSTALL_PREFIX} ..
+cmake --build . -j 8
+cmake --install .
+
+# Try to build an example
+# Build KokkosFFT code using installed KokkosFFT
+cd ${WK_DIR}
+mkdir ${EXAMPLE_BUILD_DIR} && cd ${EXAMPLE_BUILD_DIR}
+cmake -DCMAKE_BUILD_TYPE=Release -DKokkos_ENABLE_OPENMP=ON ../install_test/src
+cmake --build . -j 8
+
+if [ $? -eq 0 ]; then
+    echo "*** install test: build SUCCESSFUL ***"
+else
+    echo "*** install test: build FAILED ***"
+    exit 1;
+fi
\ No newline at end of file
diff --git a/install_test/CMakeLists.txt b/install_test/src/CMakeLists.txt
similarity index 84%
rename from install_test/CMakeLists.txt
rename to install_test/src/CMakeLists.txt
index ba9532d8..daea4cf6 100644
--- a/install_test/CMakeLists.txt
+++ b/install_test/src/CMakeLists.txt
@@ -4,6 +4,8 @@ project(install-test LANGUAGES CXX)
 find_package(Kokkos CONFIG REQUIRED)
 find_package(KokkosFFT CONFIG REQUIRED)
 
+message("KokkosFFT_TARGET_FILE: ${KokkosFFT_TARGET_FILE}")
+
 add_executable(install-test main.cpp)
 target_compile_features(install-test PUBLIC cxx_std_17)
 target_link_libraries(install-test PUBLIC Kokkos::kokkos KokkosFFT::fft)
\ No newline at end of file
diff --git a/install_test/main.cpp b/install_test/src/main.cpp
similarity index 100%
rename from install_test/main.cpp
rename to install_test/src/main.cpp

From 455ef3c4ca56fabc3f7f945bdd0957a53fb7df90 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Fri, 19 Jan 2024 18:38:37 +0900
Subject: [PATCH 08/14] fix indent

---
 .github/workflows/cmake.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 91498470..b9a92f8d 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -84,10 +84,10 @@ jobs:
       # Execute tests defined by the CMake configuration. Testing on CPUs only
       run: |
         docker run -v ${{github.workspace}}:/work ${{ env.container }} ctest --output-on-failure --test-dir build_OPENMP -C ${{env.BUILD_TYPE}}
-        
+
     - name: Install test on CPUs
-        run: |
-          docker run -v ${{github.workspace}}:/work ${{ env.container }} ./install_test/bin/install_cpu.sh /tmp
+      run: |
+        docker run -v ${{github.workspace}}:/work ${{ env.container }} ./install_test/bin/install_cpu.sh /tmp
 
   build_amd:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.

From e93632ba266a881ef286e18f1ba4a263304da6b2 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Fri, 19 Jan 2024 21:24:34 +0900
Subject: [PATCH 09/14] fix kokkos path and add install tests on cuda and hip

---
 .github/workflows/cmake.yml      | 18 +++++++--
 install_test/bin/install_cpu.sh  |  4 +-
 install_test/bin/install_cuda.sh | 68 ++++++++++++++++++++++++++++++++
 install_test/bin/install_hip.sh  | 68 ++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100755 install_test/bin/install_cuda.sh
 create mode 100755 install_test/bin/install_hip.sh

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index b9a92f8d..2755d1ce 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -80,15 +80,23 @@ jobs:
           docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake --build build_${backend} --config ${{env.BUILD_TYPE}} -j 2
         done
 
-    - name: Test on CPUs
+    - name: Test for OpenMP backend
       # Execute tests defined by the CMake configuration. Testing on CPUs only
       run: |
         docker run -v ${{github.workspace}}:/work ${{ env.container }} ctest --output-on-failure --test-dir build_OPENMP -C ${{env.BUILD_TYPE}}
 
-    - name: Install test on CPUs
+    - name: Install test for OpenMP backend
       run: |
         docker run -v ${{github.workspace}}:/work ${{ env.container }} ./install_test/bin/install_cpu.sh /tmp
 
+    - name: Install test for CUDA backend
+      run: |
+        for backend in ${{ env.backends }}; do
+          if [ ${backend} != "OPENMP" ]; then
+            docker run -v ${{github.workspace}}:/work ${{ env.container }} ./install_test/bin/install_cuda.sh /tmp ${backend}
+          fi
+        done
+
   build_amd:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
@@ -132,4 +140,8 @@ jobs:
     - name: Build
       # Build your program with the given configuration
       run: |
-        docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake --build build_${{matrix.backend.name}} --config ${{env.BUILD_TYPE}} -j 2
\ No newline at end of file
+        docker run -v ${{github.workspace}}:/work ${{ env.container }} cmake --build build_${{matrix.backend.name}} --config ${{env.BUILD_TYPE}} -j 2
+
+    - name: Install test for HIP backend
+      run: |
+        docker run -v ${{github.workspace}}:/work ${{ env.container }} ./install_test/bin/install_hip.sh /tmp ${{matrix.backend.name}}
\ No newline at end of file
diff --git a/install_test/bin/install_cpu.sh b/install_test/bin/install_cpu.sh
index b02d0b65..f0e4e4bc 100755
--- a/install_test/bin/install_cpu.sh
+++ b/install_test/bin/install_cpu.sh
@@ -7,11 +7,11 @@ TARGET="cpu"
 
 # Install Kokkos
 export KOKKOS_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkos_${TARGET}
-export Kokkos_DIR=${KOKKOS_INSTALL_PREFIX}/lib64/cmake/Kokkos
+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}/lib64/cmake/kokkos-fft
+export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/kokkos-fft
 export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET}
 
 export EXAMPLE_BUILD_DIR=build_example_${TARGET}
diff --git a/install_test/bin/install_cuda.sh b/install_test/bin/install_cuda.sh
new file mode 100755
index 00000000..43148a8c
--- /dev/null
+++ b/install_test/bin/install_cuda.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+args=$#
+ROOT_DIR=$1
+WK_DIR=$(pwd)
+TARGET=$2
+KOKKOS_TARGET="CUDA"
+
+# Install Kokkos
+export KOKKOS_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkos_${KOKKOS_TARGET}
+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_BUILD_DIR=build_KokkosFFT_${TARGET}
+
+export EXAMPLE_BUILD_DIR=build_example_${TARGET}
+
+# Install Kokkos
+cd ${WK_DIR}
+mkdir ${KOKKOS_BUILD_DIR} && cd ${KOKKOS_BUILD_DIR}
+
+# Get Kokkos from github repo and build
+git clone https://github.com/kokkos/kokkos.git
+cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+      -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
+      -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} kokkos
+
+cmake --build . -j 8
+cmake --install .
+
+# Install KokkosFFT
+cd ${WK_DIR}
+mkdir ${KOKKOSFFT_BUILD_DIR} && cd ${KOKKOSFFT_BUILD_DIR}
+if [ $TARGET == "CUDA" ]; then
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+            -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
+            -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ..
+else
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ..
+fi
+cmake --build . -j 8
+cmake --install .
+
+# Try to build an example
+# Build KokkosFFT code using installed KokkosFFT
+cd ${WK_DIR}
+mkdir ${EXAMPLE_BUILD_DIR} && cd ${EXAMPLE_BUILD_DIR}
+if [ $TARGET == "CUDA" ]; then
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ../install_test/src
+else
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ../install_test/src
+fi
+cmake --build . -j 8
+
+if [ $? -eq 0 ]; then
+    echo "*** install test: build SUCCESSFUL ***"
+else
+    echo "*** install test: build FAILED ***"
+    exit 1;
+fi
\ No newline at end of file
diff --git a/install_test/bin/install_hip.sh b/install_test/bin/install_hip.sh
new file mode 100755
index 00000000..1b64f38a
--- /dev/null
+++ b/install_test/bin/install_hip.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+args=$#
+ROOT_DIR=$1
+WK_DIR=$(pwd)
+TARGET=$2
+KOKKOS_TARGET="HIP"
+
+# Install Kokkos
+export KOKKOS_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkos_${KOKKOS_TARGET}
+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_BUILD_DIR=build_KokkosFFT_${TARGET}
+
+export EXAMPLE_BUILD_DIR=build_example_${TARGET}
+
+# Install Kokkos
+cd ${WK_DIR}
+mkdir ${KOKKOS_BUILD_DIR} && cd ${KOKKOS_BUILD_DIR}
+
+# Get Kokkos from github repo and build
+git clone https://github.com/kokkos/kokkos.git
+cmake -DCMAKE_CXX_COMPILER=hipcc \
+      -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_VEGA90A=ON \
+      -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} kokkos
+
+cmake --build . -j 8
+cmake --install .
+
+# Install KokkosFFT
+cd ${WK_DIR}
+mkdir ${KOKKOSFFT_BUILD_DIR} && cd ${KOKKOSFFT_BUILD_DIR}
+if [ $TARGET == "HIP" ]; then
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ..
+else
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ..
+fi
+cmake --build . -j 8
+cmake --install .
+
+# Try to build an example
+# Build KokkosFFT code using installed KokkosFFT
+cd ${WK_DIR}
+mkdir ${EXAMPLE_BUILD_DIR} && cd ${EXAMPLE_BUILD_DIR}
+if [ $TARGET == "HIP" ]; then
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ../install_test/src
+else
+    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ../install_test/src
+fi
+cmake --build . -j 8
+
+if [ $? -eq 0 ]; then
+    echo "*** install test: build SUCCESSFUL ***"
+else
+    echo "*** install test: build FAILED ***"
+    exit 1;
+fi
\ No newline at end of file

From ccbdf9ba173d04502f87dc7b90d00e302023930c Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Fri, 19 Jan 2024 22:44:45 +0900
Subject: [PATCH 10/14] fix paths for cuda and hip install test

---
 install_test/bin/install_cuda.sh | 40 +++++++++++++--------------
 install_test/bin/install_hip.sh  | 46 +++++++++++++++-----------------
 2 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/install_test/bin/install_cuda.sh b/install_test/bin/install_cuda.sh
index 43148a8c..8643ae3c 100755
--- a/install_test/bin/install_cuda.sh
+++ b/install_test/bin/install_cuda.sh
@@ -16,31 +16,34 @@ export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/kokkos-fft
 export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET}
 
 export EXAMPLE_BUILD_DIR=build_example_${TARGET}
+export CXX_COMPILER=${WK_DIR}/${KOKKOS_BUILD_DIR}/kokkos/bin/nvcc_wrapper
 
-# Install Kokkos
-cd ${WK_DIR}
-mkdir ${KOKKOS_BUILD_DIR} && cd ${KOKKOS_BUILD_DIR}
+# Install Kokkos if not exist
+if [ ! -d ${Kokkos_DIR} ]; then
+    cd ${WK_DIR}
+    mkdir ${KOKKOS_BUILD_DIR} && cd ${KOKKOS_BUILD_DIR}
 
-# Get Kokkos from github repo and build
-git clone https://github.com/kokkos/kokkos.git
-cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
-      -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
-      -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} kokkos
+    # Get Kokkos from github repo and build
+    git clone https://github.com/kokkos/kokkos.git
+    cmake -DCMAKE_CXX_COMPILER=${CXX_COMPILER} \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} kokkos
 
-cmake --build . -j 8
-cmake --install .
+    cmake --build . -j 8
+    cmake --install .
+fi
 
 # Install KokkosFFT
 cd ${WK_DIR}
 mkdir ${KOKKOSFFT_BUILD_DIR} && cd ${KOKKOSFFT_BUILD_DIR}
 if [ $TARGET == "CUDA" ]; then
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+    cmake -DCMAKE_CXX_COMPILER=${CXX_COMPILER} \
             -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
-            -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ..
+            -DCMAKE_INSTALL_PREFIX=${KOKKOSFFT_INSTALL_PREFIX} ..
 else
     cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
           -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
-          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ..
+          -DCMAKE_INSTALL_PREFIX=${KOKKOSFFT_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ..
 fi
 cmake --build . -j 8
 cmake --install .
@@ -49,15 +52,8 @@ cmake --install .
 # Build KokkosFFT code using installed KokkosFFT
 cd ${WK_DIR}
 mkdir ${EXAMPLE_BUILD_DIR} && cd ${EXAMPLE_BUILD_DIR}
-if [ $TARGET == "CUDA" ]; then
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
-          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
-          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ../install_test/src
-else
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
-          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
-          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ../install_test/src
-fi
+cmake -DCMAKE_CXX_COMPILER=${CXX_COMPILER} \
+      -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON ../install_test/src
 cmake --build . -j 8
 
 if [ $? -eq 0 ]; then
diff --git a/install_test/bin/install_hip.sh b/install_test/bin/install_hip.sh
index 1b64f38a..a716716c 100755
--- a/install_test/bin/install_hip.sh
+++ b/install_test/bin/install_hip.sh
@@ -17,30 +17,32 @@ export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET}
 
 export EXAMPLE_BUILD_DIR=build_example_${TARGET}
 
-# Install Kokkos
-cd ${WK_DIR}
-mkdir ${KOKKOS_BUILD_DIR} && cd ${KOKKOS_BUILD_DIR}
+# Install Kokkos if not exist
+if [ ! -d ${Kokkos_DIR} ]; then
+    cd ${WK_DIR}
+    mkdir ${KOKKOS_BUILD_DIR} && cd ${KOKKOS_BUILD_DIR}
 
-# Get Kokkos from github repo and build
-git clone https://github.com/kokkos/kokkos.git
-cmake -DCMAKE_CXX_COMPILER=hipcc \
-      -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_VEGA90A=ON \
-      -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} kokkos
+    # Get Kokkos from github repo and build
+    git clone https://github.com/kokkos/kokkos.git
+    cmake -DCMAKE_CXX_COMPILER=hipcc \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_VEGA90A=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} kokkos
 
-cmake --build . -j 8
-cmake --install .
+    cmake --build . -j 8
+    cmake --install .
+fi
 
 # Install KokkosFFT
 cd ${WK_DIR}
 mkdir ${KOKKOSFFT_BUILD_DIR} && cd ${KOKKOSFFT_BUILD_DIR}
 if [ $TARGET == "HIP" ]; then
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
-          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
-          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ..
+    cmake -DCMAKE_CXX_COMPILER=hipcc \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_VEGA90A=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOSFFT_INSTALL_PREFIX} ..
 else
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
-          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
-          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ..
+    cmake -DCMAKE_CXX_COMPILER=hipcc \
+          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_VEGA90A=ON \
+          -DCMAKE_INSTALL_PREFIX=${KOKKOSFFT_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ..
 fi
 cmake --build . -j 8
 cmake --install .
@@ -49,15 +51,9 @@ cmake --install .
 # Build KokkosFFT code using installed KokkosFFT
 cd ${WK_DIR}
 mkdir ${EXAMPLE_BUILD_DIR} && cd ${EXAMPLE_BUILD_DIR}
-if [ $TARGET == "HIP" ]; then
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
-          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
-          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} ../install_test/src
-else
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
-          -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_VEGA90A=ON \
-          -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ../install_test/src
-fi
+cmake -DCMAKE_CXX_COMPILER=hipcc \
+      -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_VEGA90A=ON \
+      ../install_test/src
 cmake --build . -j 8
 
 if [ $? -eq 0 ]; then

From 11d1909eb7ccc58cb143d689bff2922a144d78ec Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Fri, 19 Jan 2024 23:53:38 +0900
Subject: [PATCH 11/14] fix compiler

---
 install_test/bin/install_cuda.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_test/bin/install_cuda.sh b/install_test/bin/install_cuda.sh
index 8643ae3c..3da16159 100755
--- a/install_test/bin/install_cuda.sh
+++ b/install_test/bin/install_cuda.sh
@@ -16,7 +16,7 @@ export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/kokkos-fft
 export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET}
 
 export EXAMPLE_BUILD_DIR=build_example_${TARGET}
-export CXX_COMPILER=${WK_DIR}/${KOKKOS_BUILD_DIR}/kokkos/bin/nvcc_wrapper
+export NVCC_WRAPPER=${WK_DIR}/${KOKKOS_BUILD_DIR}/kokkos/bin/nvcc_wrapper
 
 # Install Kokkos if not exist
 if [ ! -d ${Kokkos_DIR} ]; then
@@ -41,7 +41,7 @@ if [ $TARGET == "CUDA" ]; then
             -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
             -DCMAKE_INSTALL_PREFIX=${KOKKOSFFT_INSTALL_PREFIX} ..
 else
-    cmake -DCMAKE_CXX_COMPILER=kokkos/bin/nvcc_wrapper \
+    cmake -DCMAKE_CXX_COMPILER=${CXX_COMPILER} \
           -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_CUDA=ON -DKokkos_ARCH_AMPERE80=ON \
           -DCMAKE_INSTALL_PREFIX=${KOKKOSFFT_INSTALL_PREFIX} -DKokkosFFT_ENABLE_HOST_AND_DEVICE=ON ..
 fi

From 4da61045260f96963d0d6726e0d60860f3bb59ed Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Sat, 20 Jan 2024 00:05:47 +0900
Subject: [PATCH 12/14] fix CXX compilere

---
 install_test/bin/install_cuda.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_test/bin/install_cuda.sh b/install_test/bin/install_cuda.sh
index 3da16159..3c91d002 100755
--- a/install_test/bin/install_cuda.sh
+++ b/install_test/bin/install_cuda.sh
@@ -16,7 +16,7 @@ export KokkosFFT_DIR=${KOKKOSFFT_INSTALL_PREFIX}/lib/cmake/kokkos-fft
 export KOKKOSFFT_BUILD_DIR=build_KokkosFFT_${TARGET}
 
 export EXAMPLE_BUILD_DIR=build_example_${TARGET}
-export NVCC_WRAPPER=${WK_DIR}/${KOKKOS_BUILD_DIR}/kokkos/bin/nvcc_wrapper
+export CXX_COMPILER=${WK_DIR}/${KOKKOS_BUILD_DIR}/kokkos/bin/nvcc_wrapper
 
 # Install Kokkos if not exist
 if [ ! -d ${Kokkos_DIR} ]; then

From 3d8c5a8ea4e52a51cee3e1b8717350f3659e6f42 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Sat, 20 Jan 2024 01:32:49 +0900
Subject: [PATCH 13/14] install kokkos each time

---
 install_test/bin/install_cuda.sh | 2 +-
 install_test/bin/install_hip.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_test/bin/install_cuda.sh b/install_test/bin/install_cuda.sh
index 3c91d002..7efaf85f 100755
--- a/install_test/bin/install_cuda.sh
+++ b/install_test/bin/install_cuda.sh
@@ -4,7 +4,7 @@ args=$#
 ROOT_DIR=$1
 WK_DIR=$(pwd)
 TARGET=$2
-KOKKOS_TARGET="CUDA"
+KOKKOS_TARGET=${TARGET}
 
 # Install Kokkos
 export KOKKOS_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkos_${KOKKOS_TARGET}
diff --git a/install_test/bin/install_hip.sh b/install_test/bin/install_hip.sh
index a716716c..01e8c9fc 100755
--- a/install_test/bin/install_hip.sh
+++ b/install_test/bin/install_hip.sh
@@ -4,7 +4,7 @@ args=$#
 ROOT_DIR=$1
 WK_DIR=$(pwd)
 TARGET=$2
-KOKKOS_TARGET="HIP"
+KOKKOS_TARGET=${TARGET}
 
 # Install Kokkos
 export KOKKOS_INSTALL_PREFIX=${ROOT_DIR}/usr/local/kokkos_${KOKKOS_TARGET}

From 3a39e678374ebab31978fb19758147fa6a1a0580 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Sat, 20 Jan 2024 03:05:26 +0900
Subject: [PATCH 14/14] install *.cmake files under install_lib directory

---
 CMakeLists.txt                 | 18 ++++++++++--------
 cmake/KokkosFFTConfig.cmake.in |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b87bb621..abe4edca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_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(KokkosFFT_INTERNAL_Kokkos  "Build internal Kokkos instead of relying on external one" OFF)
+option(KokkosFFT_INTERNAL_Kokkos "Build internal Kokkos instead of relying on external one" OFF)
 
 if (NOT KokkosFFT_INTERNAL_Kokkos)
     find_package(Kokkos REQUIRED)
@@ -26,8 +26,10 @@ endif()
 
 # Set directories used for install
 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}/${CMAKE_INSTALL_LIBDIR})
+set(INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${LIBDIR})
+set(KokkosFFT_EXPORT_TARGET "KokkosFFT-Targets")
 
 add_subdirectory(common)
 add_subdirectory(fft)
@@ -40,13 +42,13 @@ include(CMakePackageConfigHelpers)
 
 install(
     TARGETS common fft
-    EXPORT KokkosFFT-targets
+    EXPORT ${KokkosFFT_EXPORT_TARGET}
 )
 
 install(
-    EXPORT KokkosFFT-targets
+    EXPORT ${KokkosFFT_EXPORT_TARGET}
     NAMESPACE KokkosFFT::
-    DESTINATION ${INSTALL_INCLUDEDIR}
+    DESTINATION ${INSTALL_LIBDIR}
 )
 
 install(
@@ -56,12 +58,12 @@ install(
 
 install(
     FILES ${CMAKE_SOURCE_DIR}/cmake/FindFFTW.cmake
-    DESTINATION ${INSTALL_INCLUDEDIR}
+    DESTINATION ${INSTALL_LIBDIR}
 )
 
 configure_package_config_file(cmake/KokkosFFTConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfig.cmake
-    INSTALL_DESTINATION ${INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+    INSTALL_DESTINATION ${INSTALL_LIBDIR}
 )
 
 write_basic_package_version_file(
@@ -73,5 +75,5 @@ write_basic_package_version_file(
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfig.cmake
           ${CMAKE_CURRENT_BINARY_DIR}/KokkosFFTConfigVersion.cmake
-    DESTINATION ${INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+    DESTINATION ${INSTALL_LIBDIR}
 )
\ No newline at end of file
diff --git a/cmake/KokkosFFTConfig.cmake.in b/cmake/KokkosFFTConfig.cmake.in
index 5565efb6..08a81f44 100644
--- a/cmake/KokkosFFTConfig.cmake.in
+++ b/cmake/KokkosFFTConfig.cmake.in
@@ -2,10 +2,10 @@
 
 # Set and Check must go first else macro might be redefined by find_dependency ...
 set_and_check(KokkosFFT_TARGET_FILE
-"${PACKAGE_PREFIX_DIR}/include/KokkosFFT-targets.cmake")
+"${PACKAGE_PREFIX_DIR}/@LIBDIR@/@KokkosFFT_EXPORT_TARGET@.cmake")
 
 include(CMakeFindDependencyMacro)
-list(INSERT CMAKE_MODULE_PATH 0 "${PACKAGE_PREFIX_DIR}/include")
+list(INSERT CMAKE_MODULE_PATH 0 "${PACKAGE_PREFIX_DIR}/@LIBDIR@")
 find_dependency(Kokkos)
 
 if(@Kokkos_ENABLE_CUDA@)