Merge pull request #3211 from cwharris/cudf-fix-device_scalar_get

fix device_scalar::get errors cause by rmm#167
rapidsai · Oct 31, 2019 · dc7ce3b · dc7ce3b
2 parents cfd26c1 + 69f2e35
commit dc7ce3b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -91,7 +91,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)
 

diff --git a/cpp/docs/TRANSITIONGUIDE.md b/cpp/docs/TRANSITIONGUIDE.md
@@ -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

diff --git a/cpp/src/bitmask/null_mask.cu b/cpp/src/bitmask/null_mask.cu
@@ -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();
 }