Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Aug 27, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db38ab5
Patch Thrust to workaround CUDA_CUB_RET_IF_FAIL macro clearing CUDA e…
jlowe Aug 26, 2020
a3b0925
changelog
jlowe Aug 26, 2020
c72b04d
Update Thrust patch to use a scope block in the macro
jlowe Aug 26, 2020
fa8e9fb
Merge pull request #6098 from jlowe/thrust-patch
raydouglass Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 16 additions & 0 deletions thirdparty/thrust-ret-if-fail.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
// -------