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

Implement reverse in libcudf #8410

Merged
merged 26 commits into from
Jun 16, 2021
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b525ec0
Added skeleton code for reverse
shaneding May 31, 2021
d384acf
Updated naming and style
shaneding Jun 1, 2021
6657553
changed setup
shaneding Jun 2, 2021
1d17aca
Merge branch 'branch-21.08' into implement-reverse
shaneding Jun 2, 2021
7870035
added cython def
shaneding Jun 2, 2021
2cc2482
linked python with cuda codde
shaneding Jun 3, 2021
7a4ffde
change to rmm and removed debugging code
shaneding Jun 3, 2021
dbdd4a9
finished table reverse
shaneding Jun 4, 2021
91ba12d
added column-based reverse
shaneding Jun 4, 2021
880e480
remove semi-colon
shaneding Jun 4, 2021
d860b82
update python binding
shaneding Jun 4, 2021
4b75bb6
updated tests and changed indexing
shaneding Jun 7, 2021
3368f7c
added tests and documentation
shaneding Jun 7, 2021
68eb31a
remove unneeded dependencies
shaneding Jun 7, 2021
269e804
removed reverse.hpp and simplified code
shaneding Jun 8, 2021
526dab4
Merge branch 'branch-21.08' into implement-reverse
shaneding Jun 8, 2021
ac3e82d
removed reverse.hpp from meta.yml
shaneding Jun 8, 2021
c744a5b
minor edit
shaneding Jun 8, 2021
578fbbe
changed test types
shaneding Jun 10, 2021
a96c787
changed test types
shaneding Jun 10, 2021
c7571ee
removed comment
shaneding Jun 10, 2021
8fd129f
remove public python method
shaneding Jun 10, 2021
b29458a
changed reverse to private method
shaneding Jun 11, 2021
e0708c4
updated testing
shaneding Jun 14, 2021
6808d9d
removed loops from tests
shaneding Jun 15, 2021
620bcee
Merge branch 'branch-21.08' into implement-reverse
shaneding Jun 15, 2021
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
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ add_library(cudf
src/copying/gather.cu
src/copying/get_element.cu
src/copying/pack.cpp
src/copying/reverse.cu
src/copying/sample.cu
src/copying/scatter.cu
src/copying/shift.cu
Expand Down
30 changes: 30 additions & 0 deletions cpp/include/cudf/copying.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,36 @@ std::unique_ptr<table> gather(
out_of_bounds_policy bounds_policy = out_of_bounds_policy::DONT_CHECK,
rmm::mr::device_memory_resource* mr = rmm::mr::get_current_device_resource());

/**
* @brief Reverses the rows within a table.
* Creates a new table that is the reverse of @p source_table.
* Example:
* ```
* source = [[4,5,6], [7,8,9], [10,11,12]]
* return = [[6,5,4], [9,8,7], [12,11,10]]
* ```
*
* @param source_table Table that will be reversed
*/
std::unique_ptr<table> reverse(
harrism marked this conversation as resolved.
Show resolved Hide resolved
table_view const& source_table,
rmm::mr::device_memory_resource* mr = rmm::mr::get_current_device_resource());

/**
* @brief Reverses the elements of a column
* Creates a new column that is the reverse of @p source_column.
* Example:
* ```
* source = [4,5,6]
* return = [6,5,4]
* ```
*
* @param source_column Column that will be reversed
*/
std::unique_ptr<column> reverse(
shaneding marked this conversation as resolved.
Show resolved Hide resolved
column_view const& source_column,
rmm::mr::device_memory_resource* mr = rmm::mr::get_current_device_resource());

/**
* @brief Scatters the rows of the source table into a copy of the target table
* according to a scatter map.
Expand Down
68 changes: 68 additions & 0 deletions cpp/src/copying/reverse.cu
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <cudf/column/column_view.hpp>
#include <cudf/copying.hpp>
#include <cudf/detail/gather.cuh>
#include <cudf/detail/nvtx/ranges.hpp>
#include <cudf/table/table.hpp>
#include <cudf/table/table_view.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_uvector.hpp>
#include <rmm/exec_policy.hpp>
#include <rmm/mr/device/per_device_resource.hpp>

#include <thrust/iterator/constant_iterator.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_output_iterator.h>
#include <thrust/scan.h>

namespace cudf {
namespace detail {
std::unique_ptr<table> reverse(table_view const& source_table,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr)
{
size_type num_rows = source_table.num_rows();
auto elements =
make_counting_transform_iterator(0, [num_rows] __device__(auto i) { return num_rows - i - 1; });
auto elements_end = elements + source_table.num_rows();

return gather(source_table, elements, elements_end, out_of_bounds_policy::DONT_CHECK, stream, mr);
}

std::unique_ptr<column> reverse(column_view const& source_column,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr)
{
return std::move(cudf::reverse(table_view({source_column}))->release().front());
}
} // namespace detail

std::unique_ptr<table> reverse(table_view const& source_table, rmm::mr::device_memory_resource* mr)
{
CUDF_FUNC_RANGE();
return detail::reverse(source_table, rmm::cuda_stream_default, mr);
shaneding marked this conversation as resolved.
Show resolved Hide resolved
}

std::unique_ptr<column> reverse(column_view const& source_column,
rmm::mr::device_memory_resource* mr)
{
CUDF_FUNC_RANGE();
return detail::reverse(source_column, rmm::cuda_stream_default, mr);
shaneding marked this conversation as resolved.
Show resolved Hide resolved
}
} // namespace cudf
3 changes: 2 additions & 1 deletion cpp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ ConfigureTest(COPYING_TEST
copying/shift_tests.cpp
copying/slice_tests.cpp
copying/split_tests.cpp
copying/utility_tests.cpp)
copying/utility_tests.cpp
copying/reverse_tests.cpp)

###################################################################################################
# - utilities tests -------------------------------------------------------------------------------
Expand Down
175 changes: 175 additions & 0 deletions cpp/tests/copying/reverse_tests.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <cudf_test/base_fixture.hpp>
#include <cudf_test/column_utilities.hpp>
#include <cudf_test/column_wrapper.hpp>
#include <cudf_test/cudf_gtest.hpp>
#include <cudf_test/type_lists.hpp>

#include <cudf/copying.hpp>
#include <cudf/detail/iterator.cuh>
#include <cudf/scalar/scalar.hpp>
#include <cudf/scalar/scalar_factories.hpp>
#include <cudf/table/table.hpp>
#include <cudf/table/table_view.hpp>

#include <thrust/iterator/counting_iterator.h>

template <typename T>
class ReverseTypedTestFixture : public cudf::test::BaseFixture {
};

TYPED_TEST_CASE(ReverseTypedTestFixture, cudf::test::AllTypes);
TYPED_TEST(ReverseTypedTestFixture, ReverseTable)
{
using T = TypeParam;
constexpr cudf::size_type num_values{10};

auto input = cudf::test::fixed_width_column_wrapper<T, int32_t>(
thrust::make_counting_iterator(0), thrust::make_counting_iterator(0) + num_values);

auto expected_elements = cudf::detail::make_counting_transform_iterator(
0, [num_values] __device__(auto i) { return num_values - i - 1; });

auto expected =
cudf::test::fixed_width_column_wrapper<T, typename decltype(expected_elements)::value_type>(
expected_elements, expected_elements + num_values);

auto input_table = cudf::table_view{{input}};
auto const p_ret = cudf::reverse(input_table);

EXPECT_EQ(p_ret->num_columns(), 1);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(p_ret->view().column(0), expected, true);
}

TYPED_TEST(ReverseTypedTestFixture, ReverseColumn)
{
using T = TypeParam;
constexpr cudf::size_type num_values{10};

auto input = cudf::test::fixed_width_column_wrapper<T, int32_t>(
thrust::make_counting_iterator(0), thrust::make_counting_iterator(0) + num_values);

auto expected_elements = cudf::detail::make_counting_transform_iterator(
0, [num_values] __device__(auto i) { return num_values - i - 1; });

auto expected =
cudf::test::fixed_width_column_wrapper<T, typename decltype(expected_elements)::value_type>(
expected_elements, expected_elements + num_values);

auto const column_ret = cudf::reverse(input);

CUDF_TEST_EXPECT_COLUMNS_EQUAL(column_ret->view(), expected, true);
}

TYPED_TEST(ReverseTypedTestFixture, ReverseNullable)
{
using T = TypeParam;
constexpr cudf::size_type num_values{20};

std::vector<int64_t> input_values(num_values);
std::iota(input_values.begin(), input_values.end(), 1);

std::vector<bool> input_valids(num_values);
shaneding marked this conversation as resolved.
Show resolved Hide resolved
for (size_t i{0}; i < input_valids.size(); i++) { input_valids[i] = (i % 2) == 0 ? true : false; }
shaneding marked this conversation as resolved.
Show resolved Hide resolved

std::vector<T> expected_values;
std::vector<bool> expected_valids;
for (int i = num_values - 1; i > -1; i--) {
expected_values.push_back(cudf::test::make_type_param_scalar<T>(input_values[i]));
expected_valids.push_back(input_valids[i]);
}
shaneding marked this conversation as resolved.
Show resolved Hide resolved

cudf::test::fixed_width_column_wrapper<T, int64_t> input(
input_values.begin(), input_values.end(), input_valids.begin());

cudf::test::fixed_width_column_wrapper<T> expected(
expected_values.begin(), expected_values.end(), expected_valids.begin());

cudf::table_view input_table{{input}};
auto p_ret = cudf::reverse(input_table);

EXPECT_EQ(p_ret->num_columns(), 1);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(p_ret->view().column(0), expected);
}

TYPED_TEST(ReverseTypedTestFixture, ZeroSizeInput)
{
using T = TypeParam;
cudf::test::fixed_width_column_wrapper<T, int32_t> input(thrust::make_counting_iterator(0),
thrust::make_counting_iterator(0));

cudf::test::fixed_width_column_wrapper<T, int32_t> expected(thrust::make_counting_iterator(0),
thrust::make_counting_iterator(0));

cudf::table_view input_table{{input}};
auto p_ret = cudf::reverse(input_table);

EXPECT_EQ(p_ret->num_columns(), 1);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(p_ret->view().column(0), expected);
}

class ReverseStringTestFixture : public cudf::test::BaseFixture {
};

TEST_F(ReverseStringTestFixture, ReverseNullable)
{
constexpr cudf::size_type num_values{20};

std::vector<std::string> input_values(num_values);
std::vector<bool> input_valids(num_values);
for (size_t i{0}; i < num_values; i++) {
input_values[i] = "#" + std::to_string(i);
input_valids[i] = (i % 2) == 0 ? true : false;
}
shaneding marked this conversation as resolved.
Show resolved Hide resolved

std::vector<std::string> expected_values;
std::vector<bool> expected_valids;
for (int i = num_values - 1; i > -1; i--) {
expected_values.push_back(input_values[i]);
expected_valids.push_back(input_valids[i]);
}
shaneding marked this conversation as resolved.
Show resolved Hide resolved

auto input = cudf::test::strings_column_wrapper(
input_values.begin(), input_values.end(), input_valids.begin());

auto expected = cudf::test::strings_column_wrapper(
expected_values.begin(), expected_values.end(), expected_valids.begin());

cudf::table_view input_table{{input}};
auto p_ret = cudf::reverse(input_table);

EXPECT_EQ(p_ret->num_columns(), 1);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(p_ret->view().column(0), expected);
}

TEST_F(ReverseStringTestFixture, ZeroSizeInput)
{
std::vector<std::string> input_values{};
auto input = cudf::test::strings_column_wrapper(input_values.begin(), input_values.end());

auto count = cudf::test::fixed_width_column_wrapper<cudf::size_type>(
thrust::make_counting_iterator(0), thrust::make_counting_iterator(0));

auto expected = cudf::test::strings_column_wrapper(input_values.begin(), input_values.end());

cudf::table_view input_table{{input}};
auto p_ret = cudf::reverse(input_table);

EXPECT_EQ(p_ret->num_columns(), 1);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(p_ret->view().column(0), expected);
}
41 changes: 41 additions & 0 deletions python/cudf/cudf/_lib/copying.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,47 @@ def scatter(object input, object scatter_map, Table target,
return _scatter_scalar(input, scatter_map, target, bounds_check)


def _reverse_column(Column source_column):
cdef column_view reverse_column_view = source_column.view()

cdef unique_ptr[column] c_result

with nogil:
c_result = move(cpp_copying.reverse(
reverse_column_view
))

return Column.from_unique_ptr(
move(c_result)
)


def _reverse_table(Table source_table):
cdef table_view reverse_table_view = source_table.view()

cdef unique_ptr[table] c_result
with nogil:
c_result = move(cpp_copying.reverse(
reverse_table_view
))

return Table.from_unique_ptr(
move(c_result),
column_names=source_table._column_names,
index_names=source_table._index_names
)


def reverse(object source):
"""
Reversing a column or a table
"""
if isinstance(source, Column):
return _reverse_column(source)
else:
return _reverse_table(source)


def column_empty_like(Column input_column):

cdef column_view input_column_view = input_column.view()
Expand Down
8 changes: 8 additions & 0 deletions python/cudf/cudf/_lib/cpp/copying.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ cdef extern from "cudf/copying.hpp" namespace "cudf" nogil:
out_of_bounds_policy policy
) except +

cdef unique_ptr[table] reverse (
const table_view& source_table
) except +

cdef unique_ptr[column] reverse (
const column_view& source_column
) except +

cdef unique_ptr[column] shift(
const column_view& input,
size_type offset,
Expand Down
3 changes: 3 additions & 0 deletions python/cudf/cudf/core/column/column.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,9 @@ def to_array(self, fillna=None) -> np.ndarray:

return self.to_gpu_array(fillna=fillna).copy_to_host()

def _reverse(self):
return libcudf.copying.reverse(self)

def _fill(
self,
fill_value: ScalarLike,
Expand Down
4 changes: 4 additions & 0 deletions python/cudf/cudf/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -1622,6 +1622,10 @@ def _repeat(self, count):
result._copy_type_metadata(self)
return result

def _reverse(self):
result = self.__class__._from_table(libcudf.copying.reverse(self))
return result

def _fill(self, fill_values, begin, end, inplace):
col_and_fill = zip(self._columns, fill_values)

Expand Down