From 370d378fbc3d8581482f69b221f8febd97da61ff Mon Sep 17 00:00:00 2001
From: Tom Lin <tom91136@gmail.com>
Date: Wed, 17 Aug 2022 15:09:00 +0100
Subject: [PATCH] Don't use Kokkos internal headers Don't initialise kokkos
 view to zero in ctor Upgrade std to 17 for Kokkos (<17 is warning in 3.6,
 error is develop)

---
 src/kokkos/KokkosStream.cpp | 6 +++---
 src/kokkos/KokkosStream.hpp | 2 --
 src/kokkos/model.cmake      | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/kokkos/KokkosStream.cpp b/src/kokkos/KokkosStream.cpp
index 00efe92..04e0daf 100644
--- a/src/kokkos/KokkosStream.cpp
+++ b/src/kokkos/KokkosStream.cpp
@@ -14,9 +14,9 @@ KokkosStream<T>::KokkosStream(
 {
   Kokkos::initialize();
 
-  d_a = new Kokkos::View<T*>("d_a", ARRAY_SIZE);
-  d_b = new Kokkos::View<T*>("d_b", ARRAY_SIZE);
-  d_c = new Kokkos::View<T*>("d_c", ARRAY_SIZE);
+  d_a = new Kokkos::View<T*>(Kokkos::ViewAllocateWithoutInitializing("d_a"), ARRAY_SIZE);
+  d_b = new Kokkos::View<T*>(Kokkos::ViewAllocateWithoutInitializing("d_b"), ARRAY_SIZE);
+  d_c = new Kokkos::View<T*>(Kokkos::ViewAllocateWithoutInitializing("d_c"), ARRAY_SIZE);
   hm_a = new typename Kokkos::View<T*>::HostMirror();
   hm_b = new typename Kokkos::View<T*>::HostMirror();
   hm_c = new typename Kokkos::View<T*>::HostMirror();
diff --git a/src/kokkos/KokkosStream.hpp b/src/kokkos/KokkosStream.hpp
index 3aa7cf5..d7333a7 100644
--- a/src/kokkos/KokkosStream.hpp
+++ b/src/kokkos/KokkosStream.hpp
@@ -10,8 +10,6 @@
 #include <stdexcept>
 
 #include <Kokkos_Core.hpp>
-#include <Kokkos_Parallel.hpp>
-#include <Kokkos_View.hpp>
 
 #include "Stream.h"
 
diff --git a/src/kokkos/model.cmake b/src/kokkos/model.cmake
index 445991d..46c773d 100644
--- a/src/kokkos/model.cmake
+++ b/src/kokkos/model.cmake
@@ -17,7 +17,7 @@ set(KOKKOS_FLAGS_CPU_INTEL -qopt-streaming-stores=always)
 
 macro(setup)
 
-    set(CMAKE_CXX_STANDARD 14)
+    set(CMAKE_CXX_STANDARD 17)
     cmake_policy(SET CMP0074 NEW) #see https://github.com/kokkos/kokkos/blob/master/BUILD.md
 
     message(STATUS "Building using in-tree Kokkos source at `${KOKKOS_IN_TREE}`")