Fixing bad merges and applying rapidsai#8314 fix

isVoid · May 25, 2021 · a5fdd98 · a5fdd98
1 parent d8c96ed
commit a5fdd98
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cpp/include/cudf/lists/detail/scatter.cuh b/cpp/include/cudf/lists/detail/scatter.cuh
@@ -37,6 +37,7 @@ namespace detail {
 
 namespace {
 
+template <typename IndexIterator>
 rmm::device_uvector<unbound_list_view> list_vector_from_column(
   unbound_list_view::label_type label,
   cudf::detail::lists_column_device_view const& lists_column,

diff --git a/cpp/src/lists/copying/scatter_helper.cu b/cpp/src/lists/copying/scatter_helper.cu
@@ -303,13 +303,9 @@ struct list_child_constructor {
     auto const num_child_rows{
       cudf::detail::get_value<size_type>(list_offsets, list_offsets.size() - 1, stream)};
 
-    if (num_child_rows == 0) {
+    if (num_child_rows == 0)
       // make an empty lists column using the input child type
-      return make_empty_lists_column(
-        source_lists_column_view.child().child(lists_column_view::child_column_index).type(),
-        stream,
-        mr);
-    }
+      return empty_like(source_lists_column_view.child());
 
     auto child_list_views = rmm::device_uvector<unbound_list_view>(num_child_rows, stream, mr);