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

Adding support for writing empty dataframe #8490

Merged
merged 3 commits into from Jun 11, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions cpp/src/io/csv/writer_impl.cu
Expand Up @@ -286,7 +286,6 @@ void writer::impl::write_chunked_begin(table_view const& table,
if ((metadata != nullptr) && (options_.is_enabled_include_header())) {
CUDF_EXPECTS(metadata->column_names.size() == static_cast<size_t>(table.num_columns()),
"Mismatch between number of column headers and table columns.");

std::string delimiter_str{options_.get_inter_column_delimiter()};

// avoid delimiter after last element:
Expand All @@ -295,7 +294,12 @@ void writer::impl::write_chunked_begin(table_view const& table,
std::copy(metadata->column_names.begin(),
metadata->column_names.end() - 1,
std::ostream_iterator<std::string>(ss, delimiter_str.c_str()));
ss << metadata->column_names.back() << options_.get_line_terminator();

if (metadata->column_names.size() > 0) {
ss << metadata->column_names.back() << options_.get_line_terminator();
} else {
ss << options_.get_line_terminator();
}

out_sink_->host_write(ss.str().data(), ss.str().size());
}
Expand Down Expand Up @@ -355,8 +359,6 @@ void writer::impl::write(table_view const& table,
const table_metadata* metadata,
rmm::cuda_stream_view stream)
{
CUDF_EXPECTS(table.num_columns() > 0, "Empty table.");

// write header: column names separated by delimiter:
// (even for tables with no rows)
//
Expand Down
7 changes: 5 additions & 2 deletions cpp/tests/io/csv_test.cpp
Expand Up @@ -1754,9 +1754,12 @@ TEST_F(CsvReaderTest, EmptyFileWithWriter)
auto filepath = temp_env->get_temp_dir() + "EmptyFileWithWriter.csv";

cudf::table_view empty_table;
write_csv_helper(filepath, empty_table, false);
cudf_io::csv_reader_options in_opts =
cudf_io::csv_reader_options::builder(cudf_io::source_info{filepath});
auto result = cudf_io::read_csv(in_opts);

// TODO is it ok for write_csv to throw instead of just writing an empty file?
EXPECT_THROW(write_csv_helper(filepath, empty_table, false), cudf::logic_error);
CUDF_TEST_EXPECT_TABLES_EQUIVALENT(empty_table, result.tbl->view());
}

class TestSource : public cudf::io::datasource {
Expand Down
1 change: 0 additions & 1 deletion python/cudf/cudf/_lib/csv.pyx
Expand Up @@ -432,7 +432,6 @@ cpdef write_csv(
--------
cudf.io.csv.to_csv
"""

cdef table_view input_table_view = \
table.view() if index is True else table.data_view()
cdef bool include_header_c = header
Expand Down
16 changes: 12 additions & 4 deletions python/cudf/cudf/tests/test_csv.py
Expand Up @@ -1583,10 +1583,8 @@ def test_csv_writer_column_and_header_options(

def test_csv_writer_empty_columns_parameter(cudf_mixed_dataframe):
df = cudf_mixed_dataframe

buffer = BytesIO()
with pytest.raises(RuntimeError):
df.to_csv(buffer, columns=[], index=False)
write_str = df.to_csv(columns=[], index=False)
assert_eq(write_str, "\n")


def test_csv_writer_multiindex(tmpdir):
Expand Down Expand Up @@ -1979,3 +1977,13 @@ def test_to_csv_compression_error():
error_message = "Writing compressed csv is not currently supported in cudf"
with pytest.raises(NotImplementedError, match=re.escape(error_message)):
df.to_csv("test.csv", compression=compression)


def test_empty_df_no_index():
actual = cudf.DataFrame({})
buffer = BytesIO()
actual.to_csv(buffer, index=False)

result = cudf.read_csv(buffer)

assert_eq(actual, result)