Merge pull request #141 from PointKernel/self-contained-header

Make all headers self-contained

benchmarks/hash_table/dynamic_map_bench.cu

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 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.
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-#include <benchmark/benchmark.h>
+#include <synchronization.hpp>
+
 #include <cuco/dynamic_map.cuh>
+
+#include <benchmark/benchmark.h>
+
 #include <iostream>
 #include <random>
-#include <synchronization.hpp>
 
 enum class dist_type { UNIQUE, UNIFORM, GAUSSIAN };
 

benchmarks/hash_table/static_multimap/count_bench.cu

@@ -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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <random>
+#include <key_generator.hpp>
+
+#include <cuco/static_multimap.cuh>
 
 #include <nvbench/nvbench.cuh>
-#include <thrust/device_vector.h>
 
-#include <cuco/static_multimap.cuh>
-#include <key_generator.hpp>
+#include <thrust/device_vector.h>
 
 /**
  * @brief A benchmark evaluating multi-value `count` performance:

benchmarks/hash_table/static_multimap/insert_bench.cu

@@ -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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <random>
+#include <key_generator.hpp>
+
+#include <cuco/static_multimap.cuh>
 
 #include <nvbench/nvbench.cuh>
-#include <thrust/device_vector.h>
 
-#include <cuco/static_multimap.cuh>
-#include <key_generator.hpp>
+#include <thrust/device_vector.h>
 
 /**
  * @brief A benchmark evaluating multi-value `insert` performance:

benchmarks/hash_table/static_multimap/optimal_retrieve_bench.cu

@@ -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.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
+#include <cuco/static_multimap.cuh>
+
 #include <nvbench/nvbench.cuh>
 
-#include <random>
 #include <thrust/device_vector.h>
 
-#include "cuco/static_multimap.cuh"
-
 /**
  * @brief Generates input keys by a given number of repetitions per key.
  *

benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu

@@ -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.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <random>
+#include <key_generator.hpp>
+
+#include <cuco/static_multimap.cuh>
 
 #include <nvbench/nvbench.cuh>
+
 #include <thrust/device_vector.h>
 #include <thrust/iterator/discard_iterator.h>
 
-#include <cuco/static_multimap.cuh>
-#include <key_generator.hpp>
-
 namespace {
 // Custom pair equal
 template <typename Key, typename Value>

benchmarks/hash_table/static_multimap/query_bench.cu

@@ -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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <random>
+#include <key_generator.hpp>
+
+#include <cuco/static_multimap.cuh>
 
 #include <nvbench/nvbench.cuh>
-#include <thrust/device_vector.h>
 
-#include <cuco/static_multimap.cuh>
-#include <key_generator.hpp>
+#include <thrust/device_vector.h>
 
 /**
  * @brief A benchmark evaluating multi-value query (`count` + `retrieve`) performance:

benchmarks/hash_table/static_multimap/retrieve_bench.cu

@@ -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.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-#include <cuco/static_multimap.cuh>
 #include <key_generator.hpp>
 
-#include <thrust/device_vector.h>
+#include <cuco/static_multimap.cuh>
 
 #include <nvbench/nvbench.cuh>
 
-#include <random>
+#include <thrust/device_vector.h>
 
 /**
  * @brief A benchmark evaluating multi-value `retrieve` performance:

benchmarks/synchronization.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 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,7 @@
 
 // Google Benchmark library
 #include <benchmark/benchmark.h>
+
 #include <cuda_runtime_api.h>
 
 #define BENCH_CUDA_TRY(call)                                                         \
@@ -129,4 +130,4 @@ class cuda_event_timer {
   cudaEvent_t stop_;
   cudaStream_t stream_;
   benchmark::State* p_state;
-};
+};

examples/static_map/custom_type_example.cu

@@ -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.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <cuco/static_map.cuh>
+
 #include <thrust/device_vector.h>
 #include <thrust/logical.h>
 #include <thrust/transform.h>
 
-#include <cuco/static_map.cuh>
-
 // User-defined key type
 #ifdef CUCO_NO_INDEPENDENT_THREADS
 struct custom_key_type {

examples/static_map/static_map_example.cu

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <limits>
+#include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 
-#include <cuco/static_map.cuh>
+#include <limits>
 
 int main(void)
 {

examples/static_multimap/static_multimap_example.cu

@@ -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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <limits>
+#include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 
-#include <cuco/static_multimap.cuh>
+#include <limits>
 
 int main(void)
 {

include/cuco/detail/dynamic_map_kernels.cuh

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 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.
@@ -14,6 +14,12 @@
  * limitations under the License.
  */
 
+#include <cub/block/block_reduce.cuh>
+
+#include <cuda/std/atomic>
+
+#include <cooperative_groups.h>
+
 namespace cuco {
 namespace detail {
 namespace cg = cooperative_groups;
@@ -457,4 +463,4 @@ __global__ void contains(InputIt first,
   }
 }
 }  // namespace detail
-}  // namespace cuco
+}  // namespace cuco

include/cuco/detail/error.hpp

@@ -17,6 +17,7 @@
 #pragma once
 
 #include <cuda_runtime_api.h>
+
 #include <stdexcept>
 #include <string>
 

include/cuco/detail/pair.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.
@@ -19,6 +19,8 @@
 #include <thrust/device_reference.h>
 #include <thrust/pair.h>
 #include <thrust/tuple.h>
+
+#include <algorithm>
 #include <tuple>
 #include <type_traits>
 

include/cuco/detail/probe_sequence_impl.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.
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include <cuda/std/atomic>
-
 #include <cuco/detail/hash_functions.cuh>
 #include <cuco/detail/pair.cuh>
 
+#include <cuda/std/atomic>
+
 namespace cuco {
 namespace detail {
 

include/cuco/detail/static_map_kernels.cuh

@@ -14,6 +14,12 @@
  * limitations under the License.
  */
 
+#include <cub/block/block_reduce.cuh>
+
+#include <cuda/std/atomic>
+
+#include <cooperative_groups.h>
+
 namespace cuco {
 namespace detail {
 namespace cg = cooperative_groups;

include/cuco/detail/static_multimap/kernels.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.
@@ -14,10 +14,15 @@
  * limitations under the License.
  */
 
-#include <cooperative_groups/memcpy_async.h>
+#include <cuco/detail/pair.cuh>
+
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
-#include <cuco/detail/pair.cuh>
+#include <cub/block/block_reduce.cuh>
+
+#include <cuda/std/atomic>
+
+#include <cooperative_groups/memcpy_async.h>
 
 namespace cuco {
 namespace detail {

include/cuco/detail/static_multimap/static_multimap.inl

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+#include <cuco/detail/utils.hpp>
+
 #include <thrust/count.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/tuple.h>
 
-#include <cuco/detail/utils.hpp>
+#include <iterator>
 
 namespace {
 /**