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.

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

fix device_scalar::get errors cause by rmm#167 #3211

Merged
merged 5 commits into from
Oct 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
- PR #3228 Default initialize RMM when Java native dependencies are loaded
- PR #3236 Fix Numba 0.46+/CuPy 6.3 interface compatibility
- PR #3256 Fix orc writer crash with multiple string columns

- PR #3211 Fix breaking change caused by rapidsai/rmm#167

# cuDF 0.10.0 (16 Oct 2019)

Expand Down
4 changes: 2 additions & 2 deletions cpp/docs/TRANSITIONGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ This is effectively a convenience wrapper around a `rmm::device_vector<T>` of le
// and initializes the value to 42
rmm::device_scalar<int> int_scalar{42, stream, mr};

// scalar.get() returns pointer to value in device memory
kernel<<<...>>>(int_scalar.get(),...);
// scalar.data() returns pointer to value in device memory
kernel<<<...>>>(int_scalar.data(),...);

// scalar.value() synchronizes the scalar's stream and copies the
// value from device to host and returns the value
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/bitmask/null_mask.cu
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ cudf::size_type count_set_bits(bitmask_type const *bitmask, size_type start,

count_set_bits_kernel<block_size>
<<<grid.num_blocks, grid.num_threads_per_block, 0, stream>>>(
bitmask, start, stop - 1, non_zero_count.get());
bitmask, start, stop - 1, non_zero_count.data());

return non_zero_count.value();
}
Expand Down