-
Notifications
You must be signed in to change notification settings - Fork 917
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from aschaffer/branch-0.11
forked fea_ext_port_merge <- forked branch-0.11
- Loading branch information
Showing
19 changed files
with
581 additions
and
189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright (c) 2019, 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/cudf.h> | ||
| #include <cudf/types.hpp> | ||
| #include <tests/utilities/base_fixture.hpp> | ||
| #include <cudf/table/table_view.hpp> | ||
| #include <cudf/sorting.hpp> | ||
| #include <cudf/column/column_factories.hpp> | ||
| #include <tests/utilities/column_utilities.hpp> | ||
| #include <cudf/utilities/type_dispatcher.hpp> | ||
| #include <tests/utilities/type_lists.hpp> | ||
| #include <tests/utilities/column_wrapper.hpp> | ||
| #include <cudf/legacy/interop.hpp> | ||
| #include <tests/utilities/legacy/cudf_test_utils.cuh> | ||
| #include <vector> | ||
|
|
||
| template <typename T> | ||
| struct SortedOrder : public cudf::test::BaseFixture {}; | ||
|
|
||
| TYPED_TEST_CASE(SortedOrder, cudf::test::NumericTypes); | ||
|
|
||
| TYPED_TEST(SortedOrder, WithNullMax) | ||
| { | ||
| using T = TypeParam; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<T> col1{{5, 4, 3, 5, 8, 5}, {1, 1, 0, 1, 1, 1}}; | ||
| cudf::test::strings_column_wrapper col2({"d", "e", "a", "d", "k", "d"}, {1, 1, 0, 1, 1, 1}); | ||
| cudf::test::fixed_width_column_wrapper<T> col3{{10, 40, 70, 5, 2, 10}, {1, 1, 0, 1, 1, 1}}; | ||
| cudf::table_view input {{col1, col2, col3}}; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<int32_t> expected{{1, 0, 5, 3, 4, 2}}; | ||
| std::vector<cudf::order> column_order {cudf::order::ASCENDING, cudf::order::ASCENDING, cudf::order::DESCENDING}; | ||
|
|
||
| auto got = cudf::experimental::sorted_order(input, column_order, cudf::null_order::AFTER); | ||
|
|
||
| cudf::test::expect_columns_equal(expected, got->view()); | ||
| } | ||
|
|
||
| TYPED_TEST(SortedOrder, WithNullMin) | ||
| { | ||
| using T = TypeParam; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<T> col1{{5, 4, 3, 5, 8}, {1, 1, 0, 1, 1}}; | ||
| cudf::test::strings_column_wrapper col2({"d", "e", "a", "d", "k"}, {1, 1, 0, 1, 1}); | ||
| cudf::test::fixed_width_column_wrapper<T> col3{{10, 40, 70, 5, 2}, {1, 1, 0, 1, 1}}; | ||
| cudf::table_view input {{col1, col2, col3}}; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<int32_t> expected{{2, 1, 0, 3, 4}}; | ||
| std::vector<cudf::order> column_order {cudf::order::ASCENDING, cudf::order::ASCENDING, cudf::order::DESCENDING}; | ||
|
|
||
| auto got = cudf::experimental::sorted_order(input, column_order, cudf::null_order::BEFORE); | ||
|
|
||
| cudf::test::expect_columns_equal(expected, got->view()); | ||
| } | ||
|
|
||
| TYPED_TEST(SortedOrder, WithAllValid) | ||
| { | ||
| using T = TypeParam; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<T> col1{{5, 4, 3, 5, 8}}; | ||
| cudf::test::strings_column_wrapper col2({"d", "e", "a", "d", "k"}); | ||
| cudf::test::fixed_width_column_wrapper<T> col3{{10, 40, 70, 5, 2}}; | ||
| cudf::table_view input {{col1, col2, col3}}; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<int32_t> expected{{2, 1, 0, 3, 4}}; | ||
| std::vector<cudf::order> column_order {cudf::order::ASCENDING, cudf::order::ASCENDING, cudf::order::DESCENDING}; | ||
|
|
||
| auto got = cudf::experimental::sorted_order(input, column_order, cudf::null_order::AFTER); | ||
|
|
||
| cudf::test::expect_columns_equal(expected, got->view()); | ||
| } | ||
|
|
||
| TYPED_TEST(SortedOrder, MisMatchInColumnOrder) | ||
| { | ||
| using T = TypeParam; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<T> col1{{5, 4, 3, 5, 8}}; | ||
| cudf::test::strings_column_wrapper col2({"d", "e", "a", "d", "k"}); | ||
| cudf::test::fixed_width_column_wrapper<T> col3{{10, 40, 70, 5, 2}}; | ||
| cudf::table_view input {{col1, col2, col3}}; | ||
|
|
||
| std::vector<cudf::order> column_order {cudf::order::ASCENDING, cudf::order::DESCENDING}; | ||
|
|
||
| EXPECT_THROW(cudf::experimental::sorted_order(input, column_order, cudf::null_order::AFTER), cudf::logic_error); | ||
| } | ||
|
|
||
| TYPED_TEST(SortedOrder, ZeroSizedColumns) | ||
| { | ||
| using T = TypeParam; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<T> col1{}; | ||
| cudf::table_view input {{col1}}; | ||
|
|
||
| cudf::test::fixed_width_column_wrapper<int32_t> expected{}; | ||
| std::vector<cudf::order> column_order {cudf::order::ASCENDING}; | ||
|
|
||
| auto got = cudf::experimental::sorted_order(input, column_order, cudf::null_order::AFTER); | ||
|
|
||
| cudf::test::expect_columns_equal(expected, got->view()); | ||
| } |
Oops, something went wrong.