Commit 3f80a560 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'correct_thrust_patch_for_cuda_10'

1d980ed1 Thrust Patches tried to apply CUDA 10.1 patches to CUDA 10.0
Acked-by: Kitware Robot's avatarKitware Robot <>
Merge-request: !1639
parents fda02b3a 1d980ed1
......@@ -176,8 +176,8 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64);
#endif //THRUST_VERSION >= 100900
#if THRUST_VERSION >= 100903
//So for thrust 1.9.3+ (CUDA 10.1+) the stateless_resource_allocator has a bug
#if THRUST_VERSION >= 100904
//So for thrust 1.9.4+ (CUDA 10.1+) the stateless_resource_allocator has a bug
//where it is not marked as __host__ __device__ && __thrust_exec_check_disable__.
//To fix this we add a new partial specialization on cuda::memory_resource
//which the correct markup (which is what everyone calls).
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment