From 2fe12faddc3736e3385cfa095513edeb6c44b5ba Mon Sep 17 00:00:00 2001 From: Nader Al Awar Date: Fri, 20 Sep 2024 21:47:50 -0500 Subject: [PATCH] ENH: set Kokkos version to 4.4.01 (#60) --- cmake/Modules/KokkosPythonOptions.cmake | 2 +- external/kokkos | 2 +- include/pools.hpp | 1 + include/views.hpp | 1 + setup.py | 2 +- src/enumeration.cpp | 1 + src/libpykokkos.cpp | 1 + 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/KokkosPythonOptions.cmake b/cmake/Modules/KokkosPythonOptions.cmake index ff6d094..8d8b904 100644 --- a/cmake/Modules/KokkosPythonOptions.cmake +++ b/cmake/Modules/KokkosPythonOptions.cmake @@ -84,7 +84,7 @@ set(CMAKE_C_VISIBILITY_PRESET "default" CACHE STRING "Default visibility") set(CMAKE_CXX_VISIBILITY_PRESET "default" CACHE STRING "Default visibility") # pybind11 has not migrated to CMAKE_CXX_STANDARD and neither has kokkos -SET(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ language standard") +SET(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ language standard") SET(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "Require standard") SET(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Extensions") IF(NOT Kokkos_CXX_STANDARD) diff --git a/external/kokkos b/external/kokkos index 1a0c2ff..15dc143 160000 --- a/external/kokkos +++ b/external/kokkos @@ -1 +1 @@ -Subproject commit 1a0c2ff6daf1068c65529ec04c2c046177847869 +Subproject commit 15dc143e5f39949eece972a798e175c4b463d4b8 diff --git a/include/pools.hpp b/include/pools.hpp index 5548a34..3c2240f 100644 --- a/include/pools.hpp +++ b/include/pools.hpp @@ -46,6 +46,7 @@ #include #include +#include namespace Common { template diff --git a/include/views.hpp b/include/views.hpp index b7c65f2..309d287 100644 --- a/include/views.hpp +++ b/include/views.hpp @@ -53,6 +53,7 @@ #include #include +#include //----------------------------------------------------------------------------// diff --git a/setup.py b/setup.py index e740ab0..2344d72 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def add_arg_bool_option(lc_name, disp_name, default=None): add_arg_bool_option("timing", "ENABLE_TIMING") parser.add_argument( "--cxx-standard", - default=14, + default=17, type=int, choices=[14, 17, 20], help="Set C++ language standard", diff --git a/src/enumeration.cpp b/src/enumeration.cpp index 4e9c7be..55db867 100644 --- a/src/enumeration.cpp +++ b/src/enumeration.cpp @@ -51,6 +51,7 @@ #include #include +#include //----------------------------------------------------------------------------// diff --git a/src/libpykokkos.cpp b/src/libpykokkos.cpp index f3305e2..fd8ff91 100644 --- a/src/libpykokkos.cpp +++ b/src/libpykokkos.cpp @@ -49,6 +49,7 @@ #include "traits.hpp" #include +#include //----------------------------------------------------------------------------// //