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.

Sign up for GitHub

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

Allow empty input table in ast compute_column #13245

Merged
merged 4 commits into from
May 2, 2023
Merged

Allow empty input table in ast compute_column #13245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb79b08
Allow zero-sized output in compute_column
wence- Apr 28, 2023
8e61e32
Add test of AST addition on empty table
wence- Apr 28, 2023
ea01fa1
Test df.eval on empty dataframes
wence- Apr 28, 2023
233abdf
Merge branch 'branch-23.06' into wence/fix/issue-13236
vuule Apr 28, 2023
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
3 changes: 2 additions & 1 deletion cpp/src/transform/compute_column.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2022, NVIDIA CORPORATION.
* Copyright (c) 2020-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -97,6 +97,7 @@ std::unique_ptr<column> compute_column(table_view const& table,

auto output_column = cudf::make_fixed_width_column(
parser.output_type(), table.num_rows(), output_column_mask_state, stream, mr);
if (table.num_rows() == 0) { return output_column; }
auto mutable_output_device =
cudf::mutable_column_device_view::create(output_column->mutable_view(), stream);

Expand Down
16 changes: 16 additions & 0 deletions cpp/tests/ast/transform_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,22 @@ TEST_F(TransformTest, BasicAddition)
CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, result->view(), verbosity);
}

TEST_F(TransformTest, BasicAdditionEmptyTable)
{
auto c_0 = column_wrapper<int32_t>{};
auto c_1 = column_wrapper<int32_t>{};
auto table = cudf::table_view{{c_0, c_1}};

auto col_ref_0 = cudf::ast::column_reference(0);
auto col_ref_1 = cudf::ast::column_reference(1);
auto expression = cudf::ast::operation(cudf::ast::ast_operator::ADD, col_ref_0, col_ref_1);

auto expected = column_wrapper<int32_t>{};
auto result = cudf::compute_column(table, expression);

CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, result->view(), verbosity);
}

TEST_F(TransformTest, BasicAdditionCast)
{
auto c_0 = column_wrapper<int64_t>{3, 20, 1, 50};
Expand Down
16 changes: 13 additions & 3 deletions python/cudf/cudf/tests/test_dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9757,9 +9757,19 @@ def test_empty_numeric_only(data):
assert_eq(expected, actual)


@pytest.fixture
def df_eval():
N = 10
@pytest.fixture(params=[0, 10], ids=["empty", "10"])
def df_eval(request):
N = request.param
if N == 0:
value = np.zeros(0, dtype="int")
return cudf.DataFrame(
{
"a": value,
"b": value,
"c": value,
"d": value,
}
)
int_max = 10
rng = cupy.random.default_rng(0)
return cudf.DataFrame(
Expand Down