Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-07-06 07:17:25 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Disable Thrust patch that is no longer needed in modern Thrust

Browse Source 
There is a Thrust patch that works around an issue in Thrust 1.9.4
(https://github.com/NVIDIA/thrust/issues/972). The underlying issue
should be fixed in recent versions. In recent versions of CUDA, the patch
breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818).

This change fixes the problem by disabling the patch where it is not
needed.
This commit is contained in:
Kenneth Moreland 2024-06-04 10:04:42 -04:00
parent 6eae30063a
commit 4a4466e7c8
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/changelog/obsolete-thrust-patch.md Normal file
View File

@ -0,0 +1,9 @@
# Disable Thrust patch that is no longer needed in modern Thrust
There is a Thrust patch that works around an issue in Thrust 1.9.4
(https://github.com/NVIDIA/thrust/issues/972). The underlying issue
should be fixed in recent versions. In recent versions of CUDA, the patch
breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818).
This change fixes the problem by disabling the patch where it is not
needed.

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

@ -170,9 +170,9 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64);
#undef ALIGN_RE_PAIR
}
}
#endif //THRUST_VERSION >= 100900
#endif //THRUST_VERSION >= 100900 && THRUST_VERSION < 100906
#if THRUST_VERSION >= 100904
#if (THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909)
//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
@ -236,7 +236,7 @@ public:
};
}
}
#endif //THRUST_VERSION >= 100903
#endif //(THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909)
#if THRUST_VERSION < 100900