Fix Kokkos header includes (#45)

* Fix Kokkos header includes * pin `setuptools` version like other projects do--for projects with compiled extensions newer `setuptools` is often problematic Co-authored-by: Tyler Reddy <[email protected]>
kokkos · Aug 31, 2022 · 3402d93 · 3402d93
1 parent 87290b3
commit 3402d93
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 17 deletions.
diff --git a/cmake/Modules/KokkosPythonPackages.cmake b/cmake/Modules/KokkosPythonPackages.cmake
@@ -94,11 +94,7 @@ IF(ENABLE_PRECOMPILED_HEADERS)
     TARGET_PRECOMPILE_HEADERS(libpykokkos-precompiled-headers
         INTERFACE
             <Kokkos_Core.hpp>
-            <Kokkos_View.hpp>
-            <Kokkos_Layout.hpp>
-            <Kokkos_Core_fwd.hpp>
             <Kokkos_DynRankView.hpp>
-            <Kokkos_MemoryTraits.hpp>
     )
 
     # pybind11 headers

diff --git a/cmake/Templates/KokkosExp_InterOp.hpp b/cmake/Templates/KokkosExp_InterOp.hpp
@@ -45,12 +45,8 @@
 #ifndef KOKKOS_CORE_EXP_INTEROP_HPP
 #define KOKKOS_CORE_EXP_INTEROP_HPP
 
-#include <Kokkos_Core_fwd.hpp>
-#include <Kokkos_Layout.hpp>
-#include <Kokkos_MemoryTraits.hpp>
-#include <Kokkos_View.hpp>
+#include <Kokkos_Core.hpp>
 #include <Kokkos_DynRankView.hpp>
-#include <impl/Kokkos_Utilities.hpp>
 #include <type_traits>
 
 namespace Kokkos {

diff --git a/include/deep_copy.hpp b/include/deep_copy.hpp
@@ -51,7 +51,6 @@
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_DynRankView.hpp>
-#include <Kokkos_View.hpp>
 
 //----------------------------------------------------------------------------//
 

diff --git a/include/fwd.hpp b/include/fwd.hpp
@@ -48,8 +48,6 @@
 #include "defines.hpp"
 
 #include <Kokkos_Core.hpp>
-#include <Kokkos_Layout.hpp>
-#include <Kokkos_MemoryTraits.hpp>
 
 #include <set>
 #include <string>

diff --git a/include/traits.hpp b/include/traits.hpp
@@ -49,9 +49,7 @@
 #include "defines.hpp"
 #include "fwd.hpp"
 
-#include <Kokkos_Core_fwd.hpp>
-#include <Kokkos_Layout.hpp>
-#include <Kokkos_MemoryTraits.hpp>
+#include <Kokkos_Core.hpp>
 
 //----------------------------------------------------------------------------//
 

diff --git a/include/views.hpp b/include/views.hpp
@@ -53,7 +53,6 @@
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_DynRankView.hpp>
-#include <Kokkos_View.hpp>
 
 //----------------------------------------------------------------------------//
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools >= 40.0.4",
+    "setuptools < 60.0.0",
     "setuptools_scm >= 2.0.0",
     "wheel >= 0.29.0",
     "scikit-build >= 0.8.0",