Skip to content

Commit

Permalink
Add include for <functional>
Browse files Browse the repository at this point in the history
There are some files that use `std::function` and it seems they were relying on transitive includes from CCCL headers because building cudf fails with CCCL 2.8, which is the next CCCL release in line for rapids
  • Loading branch information
miscco committed Feb 26, 2025
1 parent e5d866b commit cbe5810
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 11 deletions.
3 changes: 2 additions & 1 deletion cpp/benchmarks/common/random_distribution_factory.cuh
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 @@ -29,6 +29,7 @@
#include <thrust/tabulate.h>

#include <algorithm>
#include <functional>
#include <memory>
#include <type_traits>

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/column/column_device_view.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 All @@ -25,6 +25,7 @@
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h>

#include <functional>
#include <numeric>

namespace cudf {
Expand Down
1 change: 1 addition & 0 deletions cpp/src/io/functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <cudf/utilities/error.hpp>

#include <algorithm>
#include <functional>
#include <utility>

namespace cudf::io {
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/io/json/host_tree_algorithms.cu
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 @@ -46,6 +46,7 @@

#include <algorithm>
#include <deque>
#include <functional>

namespace cudf::io::json::detail {

Expand Down
1 change: 1 addition & 0 deletions cpp/src/io/json/read_json.cu
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <BS_thread_pool.hpp>
#include <BS_thread_pool_utils.hpp>

#include <functional>
#include <numeric>

namespace cudf::io::json::detail {
Expand Down
1 change: 1 addition & 0 deletions cpp/src/io/orc/aggregate_orc_metadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "io/utilities/row_selection.hpp"

#include <algorithm>
#include <functional>
#include <numeric>

namespace cudf::io::orc::detail {
Expand Down
1 change: 1 addition & 0 deletions cpp/src/io/orc/writer_impl.cu
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@

#include <algorithm>
#include <cstring>
#include <functional>
#include <numeric>
#include <tuple>
#include <utility>
Expand Down
1 change: 1 addition & 0 deletions cpp/src/io/parquet/reader_impl_chunking.cu
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <thrust/transform_scan.h>
#include <thrust/unique.h>

#include <functional>
#include <numeric>

namespace cudf::io::parquet::detail {
Expand Down
1 change: 1 addition & 0 deletions cpp/src/io/parquet/writer_impl.cu
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

#include <algorithm>
#include <cstring>
#include <functional>
#include <iterator>
#include <numeric>
#include <utility>
Expand Down
4 changes: 3 additions & 1 deletion cpp/src/lists/dremel.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
* Copyright (c) 2022-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 @@ -36,6 +36,8 @@
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/discard_iterator.h>

#include <functional>

namespace cudf::detail {
namespace {
/**
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/strings/regex/regex.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2019-2025, NVIDIA CORPORATION. All rights reserved.
*
* 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,7 @@
#include <cuda_runtime.h>
#include <thrust/pair.h>

#include <functional>
#include <memory>

namespace cudf {
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/strings/replace/multi_re.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 @@ -39,6 +39,7 @@
#include <thrust/pair.h>

#include <algorithm>
#include <functional>

namespace cudf {
namespace strings {
Expand Down
4 changes: 3 additions & 1 deletion cpp/src/table/row_operators.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
* Copyright (c) 2022-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,8 @@

#include <thrust/iterator/transform_iterator.h>

#include <functional>

namespace cudf {
namespace experimental {

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/text/bpe/load_merge_pairs.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
* Copyright (c) 2022-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 <cuda/functional>

#include <fstream>
#include <functional>
#include <iostream>
#include <vector>

Expand Down
4 changes: 3 additions & 1 deletion cpp/tests/groupby/tdigest_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 @@ -30,6 +30,8 @@
#include <thrust/fill.h>
#include <thrust/iterator/counting_iterator.h>

#include <functional>

namespace {
/**
* @brief Functor to generate a tdigest by key.
Expand Down
4 changes: 3 additions & 1 deletion cpp/tests/io/metadata_utilities.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 @@ -17,6 +17,8 @@
#include <cudf_test/cudf_gtest.hpp>
#include <cudf_test/io_metadata_utilities.hpp>

#include <functional>

namespace cudf::test {

void expect_metadata_equal(cudf::io::table_input_metadata in_meta,
Expand Down
1 change: 1 addition & 0 deletions cpp/tests/io/parquet_writer_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

#include <array>
#include <fstream>
#include <functional>

using cudf::test::iterators::no_nulls;

Expand Down
3 changes: 2 additions & 1 deletion cpp/tests/reductions/scan_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/tuple.h>

#include <algorithm>
#include <functional>
#include <numeric>

using aggregation = cudf::aggregation;
Expand Down

0 comments on commit cbe5810

Please sign in to comment.