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

Jump to bottom

Rename some copying_test source files .cu to .cpp #8527

Merged
merged 5 commits into from
Jun 18, 2021
Merged

Rename some copying_test source files .cu to .cpp #8527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd20443
Rename some copying_test source files .cu to .cpp
davidwendt Jun 15, 2021
59c7c9a
reorder source test file names
davidwendt Jun 15, 2021
d5897bd
fix commented out line used for debug
davidwendt Jun 15, 2021
df7df44
move clang-format off in pack_tests.cpp
davidwendt Jun 15, 2021
76f6fdb
fix merge conflict
davidwendt 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
10 changes: 5 additions & 5 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ ConfigureTest(COPYING_TEST
copying/copy_range_tests.cpp
copying/copy_tests.cu
copying/detail_gather_tests.cu
copying/gather_struct_tests.cu
copying/gather_tests.cu
copying/gather_str_tests.cu
copying/gather_list_tests.cu
copying/gather_list_tests.cpp
copying/gather_str_tests.cpp
copying/gather_struct_tests.cpp
copying/gather_tests.cpp
copying/get_value_tests.cpp
copying/pack_tests.cu
copying/pack_tests.cpp
copying/sample_tests.cpp
copying/scatter_tests.cpp
copying/scatter_list_tests.cpp
Expand Down
1 change: 0 additions & 1 deletion cpp/tests/copying/gather_list_tests.cu → cpp/tests/copying/gather_list_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include <cudf/column/column_view.hpp>
#include <cudf/copying.hpp>
#include <cudf/detail/gather.cuh>
#include <cudf/detail/gather.hpp>
#include <cudf/detail/iterator.cuh>
#include <cudf/lists/lists_column_view.hpp>
Expand Down
18 changes: 7 additions & 11 deletions cpp/tests/copying/gather_str_tests.cu → cpp/tests/copying/gather_str_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <tests/strings/utilities.h>
#include <cudf/column/column_view.hpp>
#include <cudf/copying.hpp>
#include <cudf/detail/gather.cuh>
#include <cudf/detail/gather.hpp>
#include <cudf/table/table.hpp>
#include <cudf/table/table_view.hpp>
Expand All @@ -26,8 +25,6 @@
#include <cudf_test/cudf_gtest.hpp>
#include <cudf_test/table_utilities.hpp>

#include <rmm/device_uvector.hpp>

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

Expand Down Expand Up @@ -133,11 +130,11 @@ TEST_F(GatherTestStr, GatherEmptyMapStringsColumn)
{
cudf::column_view zero_size_strings_column(
cudf::data_type{cudf::type_id::STRING}, 0, nullptr, nullptr, 0);
rmm::device_uvector<cudf::size_type> gather_map{0, rmm::cuda_stream_default};
cudf::test::fixed_width_column_wrapper<cudf::size_type> gather_map;
auto results = cudf::detail::gather(cudf::table_view({zero_size_strings_column}),
gather_map.begin(),
gather_map.end(),
cudf::out_of_bounds_policy::NULLIFY);
gather_map,
cudf::out_of_bounds_policy::NULLIFY,
cudf::detail::negative_index_policy::NOT_ALLOWED);
cudf::test::expect_strings_empty(results->get_column(0).view());
}

Expand All @@ -146,11 +143,10 @@ TEST_F(GatherTestStr, GatherZeroSizeStringsColumn)
cudf::column_view zero_size_strings_column(
cudf::data_type{cudf::type_id::STRING}, 0, nullptr, nullptr, 0);
cudf::test::fixed_width_column_wrapper<int32_t> gather_map({0});
cudf::column_view gather_view = gather_map;
cudf::test::strings_column_wrapper expected{std::pair<std::string, bool>{"", false}};
auto results = cudf::detail::gather(cudf::table_view({zero_size_strings_column}),
gather_view.begin<int32_t>(),
gather_view.end<int32_t>(),
cudf::out_of_bounds_policy::NULLIFY);
gather_map,
cudf::out_of_bounds_policy::NULLIFY,
cudf::detail::negative_index_policy::NOT_ALLOWED);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, results->get_column(0).view());
}
1 change: 0 additions & 1 deletion cpp/tests/copying/gather_struct_tests.cu → cpp/tests/copying/gather_struct_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <cudf/column/column_factories.hpp>
#include <cudf/copying.hpp>
#include <cudf/detail/iterator.cuh>
#include <cudf/detail/utilities/device_operators.cuh>
#include <cudf/lists/lists_column_view.hpp>
#include <cudf/null_mask.hpp>
#include <cudf/structs/structs_column_view.hpp>
Expand Down
2 changes: 0 additions & 2 deletions cpp/tests/copying/gather_tests.cu → cpp/tests/copying/gather_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

#include <cudf/column/column_view.hpp>
#include <cudf/copying.hpp>
#include <cudf/detail/gather.cuh>
#include <cudf/detail/gather.hpp>
#include <cudf/detail/iterator.cuh>
#include <cudf/table/table.hpp>
#include <cudf/table/table_view.hpp>
Expand Down
Loading