From ba141272c024cd893966651bfc6c50ae2a27d937 Mon Sep 17 00:00:00 2001 From: Cedric Chevalier Date: Fri, 14 Jun 2024 14:43:03 +0200 Subject: [PATCH 1/2] Update to Kokkos 4.3.01 --- Exercises/common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercises/common.cmake b/Exercises/common.cmake index 033b9417..2528ac35 100644 --- a/Exercises/common.cmake +++ b/Exercises/common.cmake @@ -27,7 +27,7 @@ else() FetchContent_Declare( Kokkos GIT_REPOSITORY https://github.com/kokkos/kokkos.git - GIT_TAG 4.0.01 + GIT_TAG 4.3.01 SOURCE_DIR ${Kokkos_COMMON_SOURCE_DIR} ) FetchContent_MakeAvailable(Kokkos) From b82fa68e050765da7ac61c51abcc850bc4039e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Chevalier?= Date: Wed, 5 Jun 2024 12:10:04 +0200 Subject: [PATCH 2/2] Fix missing include for scatter_view Kokkos hopefully does not export iostream anymore. --- Exercises/scatter_view/Begin/scatter_view.cpp | 2 ++ Exercises/scatter_view/Solution/scatter_view.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Exercises/scatter_view/Begin/scatter_view.cpp b/Exercises/scatter_view/Begin/scatter_view.cpp index f6441eab..1e973759 100644 --- a/Exercises/scatter_view/Begin/scatter_view.cpp +++ b/Exercises/scatter_view/Begin/scatter_view.cpp @@ -1,5 +1,7 @@ #include +#include // for std::cout + // EXERCISE: convert this loop into using ScatterView // #include diff --git a/Exercises/scatter_view/Solution/scatter_view.cpp b/Exercises/scatter_view/Solution/scatter_view.cpp index 4c21c1b0..85145b44 100644 --- a/Exercises/scatter_view/Solution/scatter_view.cpp +++ b/Exercises/scatter_view/Solution/scatter_view.cpp @@ -1,6 +1,8 @@ #include #include +#include // for std::cout + // Scatter Add algorithm using atomics double scatter_view_loop(Kokkos::View v, Kokkos::View r) {