Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Update ThrustPatches to be aware of issues fixed in thrust 1.9.6

Browse Source
This commit is contained in:
Robert Maynard 2019-05-31 10:08:47 -04:00
parent ae6999e534
commit 6775685c72
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/exec/cuda/internal/ThrustPatches.h
View File

@ -17,7 +17,7 @@
// Needed so we can conditionally include components
#include <thrust/version.h>
#if THRUST_VERSION >= 100900
#if THRUST_VERSION >= 100900 && THRUST_VERSION < 100906
//So for thrust 1.9.0+ ( CUDA 9.X+ ) the aligned_reinterpret_cast has a bug
//where it is not marked as __host__device__. To fix this we add a new
//overload for void* with the correct markup (which is what everyone calls).
@ -166,7 +166,7 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64);
}
#endif //THRUST_VERSION >= 100900
#if THRUST_VERSION >= 100904
#if THRUST_VERSION >= 100904 && THRUST_VERSION < 100906
//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