From 339c0195f8ea98427558e9b5f95842a2a6f95544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Dai=C3=9F?= Date: Fri, 26 May 2023 17:30:51 -0500 Subject: [PATCH 1/3] Relax required Kokkos version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 417789a..39968f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(HPX_KOKKOS_VERSION_STRING "${HPX_KOKKOS_VERSION_MAJOR}.${HPX_KOKKOS_VERSION_ find_package(HPX 1.8.1 REQUIRED) # TODO: The version requirement needs to be bumped once # https://github.com/kokkos/kokkos/pull/5628 is merged and released. -find_package(Kokkos 3.7.99 REQUIRED) +find_package(Kokkos 3.6.01 REQUIRED) if(Kokkos_ENABLE_CUDA) kokkos_check(OPTIONS CUDA_LAMBDA CUDA_LAMBDA) From dce99a9d563e0248ca9631377ce6fdad65b4159e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Dai=C3=9F?= Date: Tue, 30 May 2023 13:48:39 -0500 Subject: [PATCH 2/3] Switch to 3.6.00 --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39968f1..c5f972f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,7 @@ set(HPX_KOKKOS_VERSION_STRING "${HPX_KOKKOS_VERSION_MAJOR}.${HPX_KOKKOS_VERSION_ # Dependencies find_package(HPX 1.8.1 REQUIRED) -# TODO: The version requirement needs to be bumped once -# https://github.com/kokkos/kokkos/pull/5628 is merged and released. -find_package(Kokkos 3.6.01 REQUIRED) +find_package(Kokkos 3.6.00 REQUIRED) if(Kokkos_ENABLE_CUDA) kokkos_check(OPTIONS CUDA_LAMBDA CUDA_LAMBDA) From 5b96d639a90e20f4ac30f4632d3475da0ffd6adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Dai=C3=9F?= Date: Thu, 27 Jul 2023 12:26:13 -0500 Subject: [PATCH 3/3] Add async_dispatch check --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5f972f..9fa48a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,16 @@ set(HPX_KOKKOS_VERSION_STRING "${HPX_KOKKOS_VERSION_MAJOR}.${HPX_KOKKOS_VERSION_ find_package(HPX 1.8.1 REQUIRED) find_package(Kokkos 3.6.00 REQUIRED) +# Check that Kokkos and HPX options are consistent. + +if(Kokkos_VERSION VERSION_LESS 4.1.00) + message(INFO " Using Kokkos Version with HPX futures backend") + kokkos_check(DEVICES HPX OPTIONS HPX_ASYNC_DISPATCH) +else() + message(INFO " Using Kokkos Version with HPX Sender/Receiver backend") + kokkos_check(DEVICES HPX) +endif() + if(Kokkos_ENABLE_CUDA) kokkos_check(OPTIONS CUDA_LAMBDA CUDA_LAMBDA) if(NOT HPX_WITH_CUDA)