Skip to content

Commit

Permalink
Merge branch 'branch-25.04' into new-normalizer-apis
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwendt committed Feb 12, 2025
2 parents f980d86 + 4e79029 commit 640d8c9
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 13 deletions.
3 changes: 2 additions & 1 deletion cpp/benchmarks/hashing/partition.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2023, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, 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 All @@ -21,6 +21,7 @@
#include <cudf/partitioning.hpp>

#include <algorithm>
#include <numeric>

class Hashing : public cudf::benchmark {};

Expand Down
3 changes: 2 additions & 1 deletion cpp/benchmarks/io/text/multibyte_split.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2024, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, 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 @@ -38,6 +38,7 @@
#include <cstdio>
#include <fstream>
#include <memory>
#include <numeric>
#include <random>

temp_directory const temp_dir("cudf_nvbench");
Expand Down
3 changes: 2 additions & 1 deletion cpp/examples/billion_rows/brc_pipeline.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2024, NVIDIA CORPORATION.
* Copyright (c) 2024-2025, 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 @@ -31,6 +31,7 @@
#include <iostream>
#include <memory>
#include <string>
#include <thread>

using elapsed_t = std::chrono::duration<double>;
using byte_range = std::pair<std::size_t, std::size_t>;
Expand Down
4 changes: 3 additions & 1 deletion cpp/tests/copying/gather_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2024, NVIDIA CORPORATION.
* Copyright (c) 2020-2025, 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 @@ -27,6 +27,8 @@
#include <cudf/table/table.hpp>
#include <cudf/table/table_view.hpp>

#include <numeric>

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

Expand Down
4 changes: 3 additions & 1 deletion cpp/tests/copying/reverse_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2024, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, 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 @@ -28,6 +28,8 @@
#include <thrust/iterator/counting_iterator.h>
#include <thrust/tabulate.h>

#include <numeric>

constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS};

template <typename T>
Expand Down
3 changes: 2 additions & 1 deletion cpp/tests/fixed_point/fixed_point_tests.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2024, NVIDIA CORPORATION.
* Copyright (c) 2020-2025, 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 @@ -33,6 +33,7 @@

#include <algorithm>
#include <limits>
#include <numeric>
#include <vector>

using namespace numeric;
Expand Down
1 change: 1 addition & 0 deletions cpp/tests/io/orc_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <src/io/comp/nvcomp_adapter.hpp>

#include <array>
#include <numeric>
#include <type_traits>

namespace nvcomp = cudf::io::detail::nvcomp;
Expand Down
3 changes: 2 additions & 1 deletion cpp/tests/join/conditional_join_tests.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, 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 @@ -34,6 +34,7 @@

#include <algorithm>
#include <iostream>
#include <numeric>
#include <random>
#include <stdexcept>
#include <tuple>
Expand Down
1 change: 1 addition & 0 deletions cpp/tests/join/distinct_join_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <cudf/types.hpp>
#include <cudf/utilities/memory_resource.hpp>

#include <numeric>
#include <vector>

template <typename T>
Expand Down
3 changes: 2 additions & 1 deletion cpp/tests/join/mixed_join_tests.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2024, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, 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 @@ -32,6 +32,7 @@

#include <algorithm>
#include <iostream>
#include <numeric>
#include <random>
#include <stdexcept>
#include <tuple>
Expand Down
4 changes: 3 additions & 1 deletion cpp/tests/partitioning/hash_partition_test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, 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 @@ -31,6 +31,8 @@
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h>

#include <numeric>

using cudf::test::fixed_width_column_wrapper;
using cudf::test::strings_column_wrapper;
using structs_col = cudf::test::structs_column_wrapper;
Expand Down
3 changes: 2 additions & 1 deletion cpp/tests/reductions/reduction_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, 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 @@ -35,6 +35,7 @@

#include <algorithm>
#include <iterator>
#include <numeric>
#include <vector>

using aggregation = cudf::aggregation;
Expand Down
4 changes: 3 additions & 1 deletion cpp/tests/search/search_test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, 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 All @@ -24,6 +24,8 @@

#include <thrust/iterator/transform_iterator.h>

#include <numeric>

struct SearchTest : public cudf::test::BaseFixture {};

using cudf::numeric_scalar;
Expand Down
3 changes: 2 additions & 1 deletion cpp/tests/sort/segmented_sort_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2024, NVIDIA CORPORATION.
* Copyright (c) 2021-2025, 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 All @@ -26,6 +26,7 @@
#include <cudf/utilities/memory_resource.hpp>
#include <cudf/utilities/span.hpp>

#include <numeric>
#include <type_traits>
#include <vector>

Expand Down
1 change: 1 addition & 0 deletions cpp/tests/streams/column_view_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <cudf/null_mask.hpp>
#include <cudf/transform.hpp>

#include <numeric>
#include <random>
#include <vector>

Expand Down
3 changes: 2 additions & 1 deletion cpp/tests/strings/integers_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
* Copyright (c) 2019-2025, 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 @@ -28,6 +28,7 @@
#include <thrust/iterator/transform_iterator.h>

#include <array>
#include <numeric>
#include <string>
#include <vector>

Expand Down
1 change: 1 addition & 0 deletions cpp/tests/unary/math_ops_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <cudf/dictionary/encode.hpp>
#include <cudf/unary.hpp>

#include <numeric>
#include <vector>

using TypesToNegate = cudf::test::Types<int8_t,
Expand Down

0 comments on commit 640d8c9

Please sign in to comment.