From b3e842df59f7f3477b13396a38b05bbe75042ca4 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Tue, 24 May 2022 23:48:18 -0500
Subject: [PATCH 1/4] Add missing Thrust includes.

---
 benchmarks/hash_table/dynamic_map_bench.cu                 | 2 ++
 .../hash_table/static_multimap/pair_retrieve_bench.cu      | 4 ++++
 benchmarks/reduce_by_key/reduce_by_key.cu                  | 3 +++
 examples/static_map/custom_type_example.cu                 | 2 ++
 examples/static_map/static_map_example.cu                  | 3 +++
 examples/static_multimap/static_multimap_example.cu        | 2 ++
 include/cuco/detail/pair.cuh                               | 1 +
 include/cuco/detail/static_map.inl                         | 2 ++
 include/cuco/detail/static_multimap/device_view_impl.inl   | 3 +++
 include/cuco/detail/static_multimap/static_multimap.inl    | 1 +
 include/cuco/detail/utils.cuh                              | 2 ++
 include/cuco/static_multimap.cuh                           | 1 +
 tests/dynamic_map/unique_sequence_test.cu                  | 6 ++++++
 tests/static_map/custom_type_test.cu                       | 4 ++++
 tests/static_map/duplicate_keys_test.cu                    | 4 ++++
 tests/static_map/erase_test.cu                             | 6 +++++-
 tests/static_map/key_sentinel_test.cu                      | 2 ++
 tests/static_map/shared_memory_test.cu                     | 5 +++++
 tests/static_map/stream_test.cu                            | 7 +++++++
 tests/static_map/unique_sequence_test.cu                   | 7 +++++++
 tests/static_multimap/custom_pair_retrieve_test.cu         | 6 ++++++
 tests/static_multimap/custom_type_test.cu                  | 5 +++++
 tests/static_multimap/insert_if_test.cu                    | 4 ++++
 tests/static_multimap/multiplicity_test.cu                 | 6 ++++++
 tests/static_multimap/non_match_test.cu                    | 6 ++++++
 tests/static_multimap/pair_function_test.cu                | 5 +++++
 26 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/benchmarks/hash_table/dynamic_map_bench.cu b/benchmarks/hash_table/dynamic_map_bench.cu
index 2ce5b1a48..f92a9044c 100644
--- a/benchmarks/hash_table/dynamic_map_bench.cu
+++ b/benchmarks/hash_table/dynamic_map_bench.cu
@@ -18,6 +18,8 @@
 
 #include <cuco/dynamic_map.cuh>
 
+#include <thrust/device_vector.h>
+
 #include <benchmark/benchmark.h>
 
 #include <iostream>
diff --git a/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu b/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu
index b73a14039..d845a9ad3 100644
--- a/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu
+++ b/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu
@@ -21,7 +21,11 @@
 #include <nvbench/nvbench.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 namespace {
 // Custom pair equal
diff --git a/benchmarks/reduce_by_key/reduce_by_key.cu b/benchmarks/reduce_by_key/reduce_by_key.cu
index 3e4776c6b..1de05a42f 100644
--- a/benchmarks/reduce_by_key/reduce_by_key.cu
+++ b/benchmarks/reduce_by_key/reduce_by_key.cu
@@ -17,6 +17,9 @@
 #include <benchmark/benchmark.h>
 
 #include <thrust/device_vector.h>
+#include <thrust/distance.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/pair.h>
diff --git a/examples/static_map/custom_type_example.cu b/examples/static_map/custom_type_example.cu
index 95ca6a21e..0209c8546 100644
--- a/examples/static_map/custom_type_example.cu
+++ b/examples/static_map/custom_type_example.cu
@@ -17,6 +17,8 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
 #include <thrust/logical.h>
 #include <thrust/transform.h>
 
diff --git a/examples/static_map/static_map_example.cu b/examples/static_map/static_map_example.cu
index d6b41948e..c248d5a80 100644
--- a/examples/static_map/static_map_example.cu
+++ b/examples/static_map/static_map_example.cu
@@ -17,6 +17,9 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/functional.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/pair.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 
diff --git a/examples/static_multimap/static_multimap_example.cu b/examples/static_multimap/static_multimap_example.cu
index d229c8455..eb842655b 100644
--- a/examples/static_multimap/static_multimap_example.cu
+++ b/examples/static_multimap/static_multimap_example.cu
@@ -17,6 +17,8 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/pair.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 
diff --git a/include/cuco/detail/pair.cuh b/include/cuco/detail/pair.cuh
index fe7e7d7e8..dcaca9edf 100644
--- a/include/cuco/detail/pair.cuh
+++ b/include/cuco/detail/pair.cuh
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <thrust/device_reference.h>
+#include <thrust/memory.h>
 #include <thrust/pair.h>
 #include <thrust/tuple.h>
 
diff --git a/include/cuco/detail/static_map.inl b/include/cuco/detail/static_map.inl
index 59bbf31b5..3a8fea931 100644
--- a/include/cuco/detail/static_map.inl
+++ b/include/cuco/detail/static_map.inl
@@ -19,8 +19,10 @@
 #include <cuco/detail/utils.cuh>
 
 #include <thrust/copy.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
+#include <thrust/tuple.h>
 
 namespace cuco {
 
diff --git a/include/cuco/detail/static_multimap/device_view_impl.inl b/include/cuco/detail/static_multimap/device_view_impl.inl
index 6451773aa..8d0add2da 100644
--- a/include/cuco/detail/static_multimap/device_view_impl.inl
+++ b/include/cuco/detail/static_multimap/device_view_impl.inl
@@ -17,6 +17,9 @@
 #include <cuco/detail/bitwise_compare.cuh>
 #include <cuco/detail/utils.cuh>
 
+#include <thrust/tuple.h>
+#include <thrust/type_traits/is_contiguous_iterator.h>
+
 namespace cuco {
 
 template <typename Key,
diff --git a/include/cuco/detail/static_multimap/static_multimap.inl b/include/cuco/detail/static_multimap/static_multimap.inl
index d0be7c6c4..450c5d871 100644
--- a/include/cuco/detail/static_multimap/static_multimap.inl
+++ b/include/cuco/detail/static_multimap/static_multimap.inl
@@ -18,6 +18,7 @@
 #include <cuco/detail/utils.hpp>
 
 #include <thrust/count.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/tuple.h>
 
diff --git a/include/cuco/detail/utils.cuh b/include/cuco/detail/utils.cuh
index a848c6695..a25336883 100644
--- a/include/cuco/detail/utils.cuh
+++ b/include/cuco/detail/utils.cuh
@@ -15,6 +15,8 @@
 
 #pragma once
 
+#include <thrust/tuple.h>
+
 namespace cuco {
 namespace detail {
 
diff --git a/include/cuco/static_multimap.cuh b/include/cuco/static_multimap.cuh
index 5f7ef35e6..40b9be67b 100644
--- a/include/cuco/static_multimap.cuh
+++ b/include/cuco/static_multimap.cuh
@@ -23,6 +23,7 @@
 #include <cuco/probe_sequences.cuh>
 #include <cuco/traits.hpp>
 
+#include <thrust/for_each.h>
 #include <thrust/functional.h>
 
 #include <cuda/std/atomic>
diff --git a/tests/dynamic_map/unique_sequence_test.cu b/tests/dynamic_map/unique_sequence_test.cu
index 7aa891278..45891aa51 100644
--- a/tests/dynamic_map/unique_sequence_test.cu
+++ b/tests/dynamic_map/unique_sequence_test.cu
@@ -19,6 +19,12 @@
 #include <cuco/dynamic_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/custom_type_test.cu b/tests/static_map/custom_type_test.cu
index 33a823d10..c5722b03d 100644
--- a/tests/static_map/custom_type_test.cu
+++ b/tests/static_map/custom_type_test.cu
@@ -19,6 +19,10 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/duplicate_keys_test.cu b/tests/static_map/duplicate_keys_test.cu
index edfc9eca8..c76b11a28 100644
--- a/tests/static_map/duplicate_keys_test.cu
+++ b/tests/static_map/duplicate_keys_test.cu
@@ -19,8 +19,12 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
 #include <thrust/functional.h>
+#include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/sequence.h>
 #include <thrust/sort.h>
 
 #include <catch2/catch.hpp>
diff --git a/tests/static_map/erase_test.cu b/tests/static_map/erase_test.cu
index fa91adda2..92cae0157 100644
--- a/tests/static_map/erase_test.cu
+++ b/tests/static_map/erase_test.cu
@@ -16,6 +16,10 @@
 
 #include <catch2/catch.hpp>
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <cuco/static_map.cuh>
 
@@ -87,4 +91,4 @@ TEMPLATE_TEST_CASE_SIG("erase key", "", ((typename T), T), (int32_t), (int64_t))
     map.erase(d_keys.begin() + num_keys / 2, d_keys.end());
     REQUIRE(map.get_size() == 0);
   }
-}
\ No newline at end of file
+}
diff --git a/tests/static_map/key_sentinel_test.cu b/tests/static_map/key_sentinel_test.cu
index dd98cc18d..e52c1405e 100644
--- a/tests/static_map/key_sentinel_test.cu
+++ b/tests/static_map/key_sentinel_test.cu
@@ -19,6 +19,8 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/shared_memory_test.cu b/tests/static_map/shared_memory_test.cu
index b66583d9d..67ae88d88 100644
--- a/tests/static_map/shared_memory_test.cu
+++ b/tests/static_map/shared_memory_test.cu
@@ -19,6 +19,11 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/functional.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/stream_test.cu b/tests/static_map/stream_test.cu
index 70394f224..0aba36ab6 100644
--- a/tests/static_map/stream_test.cu
+++ b/tests/static_map/stream_test.cu
@@ -19,6 +19,13 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/functional.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/unique_sequence_test.cu b/tests/static_map/unique_sequence_test.cu
index f0594aa3e..17ccc024a 100644
--- a/tests/static_map/unique_sequence_test.cu
+++ b/tests/static_map/unique_sequence_test.cu
@@ -19,6 +19,13 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/for_each.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/custom_pair_retrieve_test.cu b/tests/static_multimap/custom_pair_retrieve_test.cu
index 9c2915da5..19c4df305 100644
--- a/tests/static_multimap/custom_pair_retrieve_test.cu
+++ b/tests/static_multimap/custom_pair_retrieve_test.cu
@@ -19,8 +19,14 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/scan.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/custom_type_test.cu b/tests/static_multimap/custom_type_test.cu
index c734d3cb9..1b5114d96 100644
--- a/tests/static_multimap/custom_type_test.cu
+++ b/tests/static_multimap/custom_type_test.cu
@@ -19,7 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/insert_if_test.cu b/tests/static_multimap/insert_if_test.cu
index 6465c5396..e40e21be7 100644
--- a/tests/static_multimap/insert_if_test.cu
+++ b/tests/static_multimap/insert_if_test.cu
@@ -19,6 +19,10 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/multiplicity_test.cu b/tests/static_multimap/multiplicity_test.cu
index de89bb1ea..83a110614 100644
--- a/tests/static_multimap/multiplicity_test.cu
+++ b/tests/static_multimap/multiplicity_test.cu
@@ -19,6 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/distance.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/non_match_test.cu b/tests/static_multimap/non_match_test.cu
index 9d0582fed..e41e91a6a 100644
--- a/tests/static_multimap/non_match_test.cu
+++ b/tests/static_multimap/non_match_test.cu
@@ -19,6 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/distance.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/pair_function_test.cu b/tests/static_multimap/pair_function_test.cu
index 66e3b1d27..86b9dbdbf 100644
--- a/tests/static_multimap/pair_function_test.cu
+++ b/tests/static_multimap/pair_function_test.cu
@@ -19,7 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 

From 97044cc872f7105570e4161c869d8a4b171a0353 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Wed, 25 May 2022 21:52:28 -0500
Subject: [PATCH 2/4] Test with Thrust 1.17.0-rc2.

---
 CMakeLists.txt |  3 +++
 versions.json  | 10 ++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 versions.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ede900a83..f8955f837 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,9 @@ rapids_cuda_init_architectures(CUCO)
 
 project(CUCO VERSION 0.0.1 LANGUAGES CXX CUDA)
 
+include(${rapids-cmake-dir}/cpm/package_override.cmake)
+rapids_cpm_package_override(${CMAKE_CURRENT_SOURCE_DIR}/versions.json)
+
 # Write the version header
 rapids_cmake_write_version_file(include/cuco/version_config.hpp)
 
diff --git a/versions.json b/versions.json
new file mode 100644
index 000000000..10dc0afe1
--- /dev/null
+++ b/versions.json
@@ -0,0 +1,10 @@
+
+{
+  "packages" : {
+    "Thrust" : {
+      "version" : "1.17.0.0-rc2",
+      "git_url" : "https://github.com/NVIDIA/thrust.git",
+      "git_tag" : "1.17.0-rc2"
+    }
+  }
+}

From 63a83773cbb372f85dbbd5625525a02d2aa40cf9 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Thu, 26 May 2022 08:32:01 -0500
Subject: [PATCH 3/4] Revert "Test with Thrust 1.17.0-rc2."

This reverts commit 97044cc872f7105570e4161c869d8a4b171a0353.
---
 CMakeLists.txt |  3 ---
 versions.json  | 10 ----------
 2 files changed, 13 deletions(-)
 delete mode 100644 versions.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8955f837..ede900a83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,9 +31,6 @@ rapids_cuda_init_architectures(CUCO)
 
 project(CUCO VERSION 0.0.1 LANGUAGES CXX CUDA)
 
-include(${rapids-cmake-dir}/cpm/package_override.cmake)
-rapids_cpm_package_override(${CMAKE_CURRENT_SOURCE_DIR}/versions.json)
-
 # Write the version header
 rapids_cmake_write_version_file(include/cuco/version_config.hpp)
 
diff --git a/versions.json b/versions.json
deleted file mode 100644
index 10dc0afe1..000000000
--- a/versions.json
+++ /dev/null
@@ -1,10 +0,0 @@
-
-{
-  "packages" : {
-    "Thrust" : {
-      "version" : "1.17.0.0-rc2",
-      "git_url" : "https://github.com/NVIDIA/thrust.git",
-      "git_tag" : "1.17.0-rc2"
-    }
-  }
-}

From f46a3e554b81c1c543c2dea8c2b32cd5aa95acc1 Mon Sep 17 00:00:00 2001
From: Yunsong Wang <wangyunsong89@gmail.com>
Date: Thu, 26 May 2022 11:54:54 -0400
Subject: [PATCH 4/4] Update include/cuco/static_multimap.cuh

---
 include/cuco/static_multimap.cuh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/cuco/static_multimap.cuh b/include/cuco/static_multimap.cuh
index 40b9be67b..5f7ef35e6 100644
--- a/include/cuco/static_multimap.cuh
+++ b/include/cuco/static_multimap.cuh
@@ -23,7 +23,6 @@
 #include <cuco/probe_sequences.cuh>
 #include <cuco/traits.hpp>
 
-#include <thrust/for_each.h>
 #include <thrust/functional.h>
 
 #include <cuda/std/atomic>