From 8a0d38640d3332338b1948f05e568510611d4fff Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 5 Feb 2024 23:21:59 +0000 Subject: [PATCH] Test a fix for the libcugraph_etl build issues from libcudf --- cpp/libcugraph_etl/src/renumbering.cu | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cpp/libcugraph_etl/src/renumbering.cu b/cpp/libcugraph_etl/src/renumbering.cu index b0fdabe996a..08759702ab4 100644 --- a/cpp/libcugraph_etl/src/renumbering.cu +++ b/cpp/libcugraph_etl/src/renumbering.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -776,7 +776,7 @@ struct renumber_functor { for (int i = 0; i < src_view.num_columns(); i++) { auto str_col_view = cudf::strings_column_view(src_view.column(i)); src_vertex_chars_ptrs.push_back( - const_cast(str_col_view.chars().data())); + const_cast(str_col_view.parent().data())); src_vertex_offset_ptrs.push_back( const_cast(str_col_view.offsets().data())); } @@ -784,7 +784,7 @@ struct renumber_functor { for (int i = 0; i < dst_view.num_columns(); i++) { auto str_col_view = cudf::strings_column_view(dst_view.column(i)); dst_vertex_chars_ptrs.push_back( - const_cast(str_col_view.chars().data())); + const_cast(str_col_view.parent().data())); dst_vertex_offset_ptrs.push_back( const_cast(str_col_view.offsets().data())); } @@ -970,13 +970,14 @@ struct renumber_functor { std::move(unrenumber_col1_chars), rmm::device_buffer{}, 0); + auto str_col_1_contents = str_col_1->release(); renumber_table_vectors.push_back( cudf::make_strings_column(size_type(key_value_count), std::move(offset_col_1), - std::move(str_col_1), + std::move(*str_col_1_contents.data), 0, - rmm::device_buffer(size_type(0), exec_strm))); + std::move(*str_col_1_contents.null_mask))); auto offset_col_2 = std::make_unique(cudf::data_type(cudf::type_id::INT32), @@ -991,13 +992,14 @@ struct renumber_functor { std::move(unrenumber_col2_chars), rmm::device_buffer{}, 0); + auto str_col_2_contents = str_col_2->release(); renumber_table_vectors.push_back( cudf::make_strings_column(size_type(key_value_count), std::move(offset_col_2), - std::move(str_col_2), + std::move(*str_col_2_contents.data), 0, - rmm::device_buffer(size_type(0), exec_strm))); + std::move(*str_col_2_contents.null_mask))); // make table from string columns - did at the end