File: 0002-restore-host_device.h.patch

package info (click to toggle)
cccl 2.4.0-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 41,200 kB
  • sloc: cpp: 236,258; python: 6,415; sh: 2,407; perl: 460; makefile: 114; xml: 13
file content (92 lines) | stat: -rw-r--r-- 3,028 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
From aca97f4b7fd24e1bd80127dbf35b25980d652073 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Thu, 11 Sep 2025 15:41:32 +0200
Subject: [PATCH] restore host_device.h

---
 thrust/thrust/detail/config/config.h      |  1 +
 thrust/thrust/detail/config/host_device.h | 52 +++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 thrust/thrust/detail/config/host_device.h

--- a/thrust/thrust/detail/config/config.h
+++ b/thrust/thrust/detail/config/config.h
@@ -42,6 +42,7 @@
 // because other config headers depend on it
 #include <thrust/detail/config/host_system.h>
 #include <thrust/detail/config/device_system.h>
+#include <thrust/detail/config/host_device.h>
 #include <thrust/detail/config/debug.h>
 #include <thrust/detail/config/global_workarounds.h>
 #include <thrust/detail/config/namespace.h>
--- /dev/null
+++ b/thrust/thrust/detail/config/host_device.h
@@ -0,0 +1,56 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file host_device.h
+ *  \brief Defines __host__ and __device__
+ */
+
+#pragma once
+
+// Internal config header that is only included through thrust/detail/config/config.h
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// since nvcc defines __host__ and __device__ for us,
+// and only nvcc knows what to do with __host__ and __device__,
+// define them to be the empty string for other compilers
+
+#if THRUST_DEVICE_COMPILER != THRUST_DEVICE_COMPILER_NVCC
+
+// since __host__ & __device__ might have already be defined, only
+// #define them if not defined already
+// XXX this will break if the client does #include <host_defines.h> later
+
+#ifndef __host__
+#define __host__
+#endif // __host__
+
+#ifndef __device__
+#define __device__
+#endif // __device__
+
+#ifndef __forceinline__
+#define __forceinline__ inline
+#endif // __forceinline__
+
+#endif
+
--- a/thrust/testing/unique_by_key.cu
+++ b/thrust/testing/unique_by_key.cu
@@ -492,9 +492,6 @@ struct TestUniqueCopyByKeyLargeOutCount
 {
     void operator()()
     {
-        using type       = std::int32_t;
-        using index_type = std::int64_t;
-
         constexpr std::size_t num_items = 4400000000ULL;
 
         auto keys_in   = thrust::make_counting_iterator(0ULL);