Merge pull request #525 from kkraus14/thrust_patch

[REVIEW] Patch Thrust to workaround CUDA_CUB_RET_IF_FAIL macro clearing CUDA errors
rapidsai · Aug 27, 2020 · 7f5ff19 · 7f5ff19
2 parents 2f83a03 + dc46492
commit 7f5ff19
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,6 +67,7 @@
 - PR #511 Specify `--basetemp` for `py.test` run
 - PR #509 Fix missing : before __LINE__ in throw string of RMM_CUDA_TRY
 - PR #510 Fix segfault in pool_memory_resource when a CUDA stream is destroyed
+- PR #525 Patch Thrust to workaround `CUDA_CUB_RET_IF_FAIL` macro clearing CUDA errors
 
 
 # RMM 0.14.0 (03 Jun 2020)

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -42,6 +42,7 @@ FetchContent_Declare(
     GIT_REPOSITORY https://github.com/thrust/thrust.git
     GIT_TAG        1.9.10
     GIT_SHALLOW    true
+    PATCH_COMMAND COMMAND patch -p1 < "${CMAKE_CURRENT_SOURCE_DIR}/thrust-ret-if-fail.patch"
 )
 
 FetchContent_GetProperties(thrust)

diff --git a/thirdparty/thrust-ret-if-fail.patch b/thirdparty/thrust-ret-if-fail.patch
@@ -0,0 +1,16 @@
+diff --git a/thrust/system/cuda/detail/core/util.h b/thrust/system/cuda/detail/core/util.h
+index a2c87772..ea4ed640 100644
+--- a/thrust/system/cuda/detail/core/util.h
++++ b/thrust/system/cuda/detail/core/util.h
+@@ -652,7 +652,10 @@ namespace core {
+   }
+
+ #define CUDA_CUB_RET_IF_FAIL(e) \
+-  if (cub::Debug((e), __FILE__, __LINE__)) return e;
++  {                             \
++    auto const error = (e);     \
++    if (cub::Debug(error, __FILE__, __LINE__)) return error; \
++  }
+
+   // uninitialized
+   // -------