From 9dec7239d77eca8dd54c453041214aa4b7ad070c Mon Sep 17 00:00:00 2001 From: Thomas Padioleau Date: Fri, 29 Nov 2024 10:01:30 +0100 Subject: [PATCH] Set Kokkos to 4.5.01 --- CMakeLists.txt | 4 ++-- README.md | 2 +- cmake/DDCConfig.cmake.in | 2 +- vendor/kokkos | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2eee1f87..5bba7b20d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ set(DDC_Kokkos_DEPENDENCY_POLICY set_property(CACHE DDC_Kokkos_DEPENDENCY_POLICY PROPERTY STRINGS "${DDC_DEPENDENCY_POLICIES}") if("${DDC_Kokkos_DEPENDENCY_POLICY}" STREQUAL "AUTO") if(NOT TARGET Kokkos::kokkos) - find_package(Kokkos 4.4...4.5 QUIET) + find_package(Kokkos 4.4...<5 QUIET) if(NOT Kokkos_FOUND) ddc_configure_kokkos() else() @@ -58,7 +58,7 @@ if("${DDC_Kokkos_DEPENDENCY_POLICY}" STREQUAL "AUTO") elseif("${DDC_Kokkos_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED") ddc_configure_kokkos() elseif("${DDC_Kokkos_DEPENDENCY_POLICY}" STREQUAL "INSTALLED") - find_package(Kokkos 4.4...4.5 REQUIRED) + find_package(Kokkos 4.4...<5 REQUIRED) ddc_check_required_kokkos_options() endif() diff --git a/README.md b/README.md index 1f6b7ce22..fcda4dcf2 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ To use DDC core, one needs the following dependencies: * a C++17-compliant compiler * CMake 3.22...<4 -* Kokkos 4.4...4.5 +* Kokkos 4.4...<5 * (optional, micro benchmarking) Benchmark 1.8...<2 * (optional, documentation) Doxygen 1.8.13...<2 * (optional, unit-testing) GoogleTest 1.14...<2 diff --git a/cmake/DDCConfig.cmake.in b/cmake/DDCConfig.cmake.in index 53bed5c4e..0e9c74b28 100644 --- a/cmake/DDCConfig.cmake.in +++ b/cmake/DDCConfig.cmake.in @@ -14,7 +14,7 @@ endmacro() set(DDC_BUILD_DOUBLE_PRECISION @DDC_BUILD_DOUBLE_PRECISION@) -ddc_find_dependency(Kokkos 4.4...4.5) +ddc_find_dependency(Kokkos 4.4...<5) if(@DDC_BUILD_KERNELS_FFT@) ddc_find_dependency(KokkosFFT 0.2.1...<1) diff --git a/vendor/kokkos b/vendor/kokkos index 15dc143e5..175257a51 160000 --- a/vendor/kokkos +++ b/vendor/kokkos @@ -1 +1 @@ -Subproject commit 15dc143e5f39949eece972a798e175c4b463d4b8 +Subproject commit 175257a51ff29a0059ec48bcd233ee096b2c0438