Update to Thrust 1.16

cpp/benchmarks/column/concatenate.cpp

@@ -24,6 +24,8 @@
 #include <cudf/table/table.hpp>
 
 #include <thrust/iterator/constant_iterator.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
 
 #include <algorithm>
 #include <vector>

cpp/benchmarks/common/generate_input.cu

@@ -43,9 +43,13 @@
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/iterator/transform_output_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
+#include <thrust/random/linear_congruential_engine.h>
 #include <thrust/random/uniform_int_distribution.h>
+#include <thrust/random/uniform_real_distribution.h>
 #include <thrust/scan.h>
 #include <thrust/tabulate.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 #include <algorithm>
 #include <cstdint>

cpp/benchmarks/copying/contiguous_split.cu

@@ -22,6 +22,8 @@
 #include <cudf/column/column.hpp>
 #include <cudf/copying.hpp>
 
+#include <thrust/iterator/counting_iterator.h>
+
 template <typename T>
 void BM_contiguous_split_common(benchmark::State& state,
                                 std::vector<T>& src_cols,

cpp/benchmarks/copying/gather.cu

@@ -21,6 +21,8 @@
 #include <cudf/copying.hpp>
 #include <cudf/types.hpp>
 
+#include <thrust/execution_policy.h>
+#include <thrust/random.h>
 #include <thrust/reverse.h>
 #include <thrust/shuffle.h>
 

cpp/benchmarks/copying/scatter.cu

@@ -21,6 +21,8 @@
 #include <cudf/copying.hpp>
 #include <cudf/types.hpp>
 
+#include <thrust/execution_policy.h>
+#include <thrust/random.h>
 #include <thrust/reverse.h>
 #include <thrust/shuffle.h>
 

cpp/benchmarks/io/text/multibyte_split.cpp

@@ -31,6 +31,7 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
+#include <thrust/host_vector.h>
 #include <thrust/transform.h>
 
 #include <cstdio>

cpp/benchmarks/iterator/iterator.cu

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,11 @@
 
 #include <cub/device/device_reduce.cuh>
 
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/pair.h>
+
 #include <benchmark/benchmark.h>
 
 #include <random>

cpp/benchmarks/join/join_common.hpp

@@ -34,6 +34,7 @@
 
 #include <nvbench/nvbench.cuh>
 
+#include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/random/linear_congruential_engine.h>
 #include <thrust/random/uniform_int_distribution.h>

cpp/benchmarks/quantiles/quantiles.cpp

@@ -20,6 +20,7 @@
 
 #include <cudf/quantiles.hpp>
 
+#include <thrust/execution_policy.h>
 #include <thrust/tabulate.h>
 
 class Quantiles : public cudf::benchmark {

cpp/benchmarks/string/copy.cu

@@ -24,6 +24,9 @@
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/column_wrapper.hpp>
 
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/random.h>
 #include <thrust/shuffle.h>
 
 class StringCopy : public cudf::benchmark {

cpp/benchmarks/string/factory.cu

@@ -29,6 +29,7 @@
 #include <rmm/device_uvector.hpp>
 
 #include <thrust/execution_policy.h>
+#include <thrust/pair.h>
 #include <thrust/transform.h>
 
 #include <limits>

cpp/benchmarks/string/url_decode.cu

@@ -32,7 +32,9 @@
 #include <thrust/execution_policy.h>
 #include <thrust/for_each.h>
 #include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
 #include <thrust/random.h>
+#include <thrust/tuple.h>
 
 struct url_string_generator {
   char* chars;

cpp/cmake/thirdparty/get_thrust.cmake

@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2020-2021, NVIDIA CORPORATION.
+# Copyright (c) 2020-2022, 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
@@ -80,6 +80,6 @@ function(find_and_configure_thrust VERSION)
   endif()
 endfunction()
 
-set(CUDF_MIN_VERSION_Thrust 1.15.0)
+set(CUDF_MIN_VERSION_Thrust 1.16.0)
 
 find_and_configure_thrust(${CUDF_MIN_VERSION_Thrust})

cpp/include/cudf/ast/detail/expression_parser.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include <cudf/types.hpp>
 
 #include <thrust/optional.h>
+#include <thrust/scan.h>
 
 #include <functional>
 #include <numeric>

cpp/include/cudf/column/column_device_view.cuh

@@ -33,6 +33,7 @@
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/optional.h>
+#include <thrust/pair.h>
 
 #include <algorithm>
 

cpp/include/cudf/column/column_factories.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
+#include <thrust/pair.h>
+
 namespace cudf {
 /**
  * @addtogroup column_factories

cpp/include/cudf/detail/aggregation/aggregation.cuh

@@ -28,6 +28,8 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <thrust/fill.h>
+
 namespace cudf {
 namespace detail {
 /**

cpp/include/cudf/detail/calendrical_month_sequence.cuh

@@ -26,6 +26,9 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/transform.h>
+
 namespace cudf {
 namespace detail {
 struct calendrical_month_sequence_functor {

cpp/include/cudf/detail/copy_if.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,9 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <thrust/copy.h>
+#include <thrust/iterator/counting_iterator.h>
+
 #include <cub/cub.cuh>
 
 #include <algorithm>

cpp/include/cudf/detail/copy_if_else.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@
 
 #include <rmm/device_scalar.hpp>
 
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/optional.h>
+
 namespace cudf {
 namespace detail {
 namespace {  // anonymous

cpp/include/cudf/detail/gather.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
 #include <thrust/functional.h>
 #include <thrust/gather.h>
 #include <thrust/host_vector.h>
+#include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/logical.h>
 

cpp/include/cudf/detail/indexalator.cuh

@@ -21,7 +21,12 @@
 #include <cudf/scalar/scalar.hpp>
 #include <cudf/utilities/traits.hpp>
 
+#include <thrust/binary_search.h>
+#include <thrust/execution_policy.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/constant_iterator.h>
+#include <thrust/optional.h>
+#include <thrust/pair.h>
 
 namespace cudf {
 namespace detail {

cpp/include/cudf/detail/iterator.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,8 @@
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
+#include <thrust/optional.h>
+#include <thrust/pair.h>
 
 #include <utility>
 

cpp/include/cudf/detail/merge.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2018-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,10 @@
 #include <cudf/table/row_operators.cuh>
 #include <cudf/utilities/type_dispatcher.hpp>
 
+#include <thrust/merge.h>
+#include <thrust/pair.h>
+#include <thrust/tuple.h>
+
 namespace cudf {
 namespace detail {
 /**

cpp/include/cudf/detail/null_mask.cuh

@@ -34,6 +34,8 @@
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 #include <algorithm>
 #include <iterator>

cpp/include/cudf/detail/replace/nulls.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.
+ * Copyright (c) 2021-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include <cudf/types.hpp>
 
 #include <thrust/functional.h>
+#include <thrust/tuple.h>
 
 namespace cudf {
 namespace detail {

cpp/include/cudf/detail/scatter.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,14 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <thrust/count.h>
+#include <thrust/distance.h>
+#include <thrust/iterator/constant_iterator.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/scatter.h>
+#include <thrust/sequence.h>
 #include <thrust/uninitialized_fill.h>
 
 namespace cudf {

cpp/include/cudf/detail/unary.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, NVIDIA CORPORATION.
+ * Copyright (c) 2018-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <thrust/transform.h>
+
 namespace cudf {
 namespace detail {
 /**

cpp/include/cudf/detail/utilities/hash_functions.cuh

@@ -25,7 +25,11 @@
 #include <cudf/strings/string_view.cuh>
 #include <cudf/types.hpp>
 
+#include <thrust/distance.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/reverse_iterator.h>
+#include <thrust/pair.h>
+#include <thrust/reverse.h>
 
 using hash_value_type = uint32_t;
 

cpp/include/cudf/detail/utilities/vector_factories.hpp

@@ -28,6 +28,8 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/mr/device/device_memory_resource.hpp>
 
+#include <thrust/host_vector.h>
+
 #include <vector>
 
 namespace cudf {

cpp/include/cudf/dictionary/detail/iterator.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 #include <cudf/detail/iterator.cuh>
 #include <cudf/dictionary/dictionary_column_view.hpp>
 
+#include <thrust/pair.h>
+
 namespace cudf {
 namespace dictionary {
 namespace detail {