Skip to content

Commit 3402d93

Browse files
dalg24tylerjereddy
andauthored
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]>
1 parent 87290b3 commit 3402d93

File tree

7 files changed

+3
-17
lines changed

7 files changed

+3
-17
lines changed

cmake/Modules/KokkosPythonPackages.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ IF(ENABLE_PRECOMPILED_HEADERS)
9494
TARGET_PRECOMPILE_HEADERS(libpykokkos-precompiled-headers
9595
INTERFACE
9696
<Kokkos_Core.hpp>
97-
<Kokkos_View.hpp>
98-
<Kokkos_Layout.hpp>
99-
<Kokkos_Core_fwd.hpp>
10097
<Kokkos_DynRankView.hpp>
101-
<Kokkos_MemoryTraits.hpp>
10298
)
10399

104100
# pybind11 headers

cmake/Templates/KokkosExp_InterOp.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@
4545
#ifndef KOKKOS_CORE_EXP_INTEROP_HPP
4646
#define KOKKOS_CORE_EXP_INTEROP_HPP
4747

48-
#include <Kokkos_Core_fwd.hpp>
49-
#include <Kokkos_Layout.hpp>
50-
#include <Kokkos_MemoryTraits.hpp>
51-
#include <Kokkos_View.hpp>
48+
#include <Kokkos_Core.hpp>
5249
#include <Kokkos_DynRankView.hpp>
53-
#include <impl/Kokkos_Utilities.hpp>
5450
#include <type_traits>
5551

5652
namespace Kokkos {

include/deep_copy.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151

5252
#include <Kokkos_Core.hpp>
5353
#include <Kokkos_DynRankView.hpp>
54-
#include <Kokkos_View.hpp>
5554

5655
//----------------------------------------------------------------------------//
5756

include/fwd.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
#include "defines.hpp"
4949

5050
#include <Kokkos_Core.hpp>
51-
#include <Kokkos_Layout.hpp>
52-
#include <Kokkos_MemoryTraits.hpp>
5351

5452
#include <set>
5553
#include <string>

include/traits.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
#include "defines.hpp"
5050
#include "fwd.hpp"
5151

52-
#include <Kokkos_Core_fwd.hpp>
53-
#include <Kokkos_Layout.hpp>
54-
#include <Kokkos_MemoryTraits.hpp>
52+
#include <Kokkos_Core.hpp>
5553

5654
//----------------------------------------------------------------------------//
5755

include/views.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353

5454
#include <Kokkos_Core.hpp>
5555
#include <Kokkos_DynRankView.hpp>
56-
#include <Kokkos_View.hpp>
5756

5857
//----------------------------------------------------------------------------//
5958

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
requires = [
3-
"setuptools >= 40.0.4",
3+
"setuptools < 60.0.0",
44
"setuptools_scm >= 2.0.0",
55
"wheel >= 0.29.0",
66
"scikit-build >= 0.8.0",

0 commit comments

Comments
 (0)