Merge pull request #6101 from rapidsai/branch-0.15

[RELEASE] Re-release v0.15 cudf [skip-ci]

CHANGELOG.md

@@ -326,6 +326,8 @@
 - PR #6032 Change black version to 19.10b0 in .pre-commit-config.yaml
 - PR #6041 Fix Java memory resource handler to rethrow original exception object
 - PR #6057 Fix issue in parquet reader with reading columns out of file-order
+- PR #6098 Patch Thrust to workaround CUDA_CUB_RET_IF_FAIL macro clearing CUDA errors
+
 
 # cuDF 0.14.0 (03 Jun 2020)
 

thirdparty/CMakeLists.txt

@@ -32,6 +32,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)

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
+   // -------