Skip to content

Commit 86c6a88

Browse files
PointKernelPointKernel
authored
Merge pull request #141 from PointKernel/self-contained-header
Make all headers self-contained
2 parents b06df97 + edb0bfd commit 86c6a88

33 files changed

+181
-129
lines changed

‎benchmarks/hash_table/dynamic_map_bench.cu‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, NVIDIA CORPORATION.
2+
* Copyright (c) 2020-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,11 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <benchmark/benchmark.h>
17+
#include <synchronization.hpp>
18+
1819
#include <cuco/dynamic_map.cuh>
20+
21+
#include <benchmark/benchmark.h>
22+
1923
#include <iostream>
2024
#include <random>
21-
#include <synchronization.hpp>
2225

2326
enum class dist_type { UNIQUE, UNIFORM, GAUSSIAN };
2427

‎benchmarks/hash_table/static_multimap/count_bench.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <random>
17+
#include <key_generator.hpp>
18+
19+
#include <cuco/static_multimap.cuh>
1820

1921
#include <nvbench/nvbench.cuh>
20-
#include <thrust/device_vector.h>
2122

22-
#include <cuco/static_multimap.cuh>
23-
#include <key_generator.hpp>
23+
#include <thrust/device_vector.h>
2424

2525
/**
2626
* @brief A benchmark evaluating multi-value `count` performance:

‎benchmarks/hash_table/static_multimap/insert_bench.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <random>
17+
#include <key_generator.hpp>
18+
19+
#include <cuco/static_multimap.cuh>
1820

1921
#include <nvbench/nvbench.cuh>
20-
#include <thrust/device_vector.h>
2122

22-
#include <cuco/static_multimap.cuh>
23-
#include <key_generator.hpp>
23+
#include <thrust/device_vector.h>
2424

2525
/**
2626
* @brief A benchmark evaluating multi-value `insert` performance:

‎benchmarks/hash_table/static_multimap/optimal_retrieve_bench.cu‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include <cuco/static_multimap.cuh>
18+
1719
#include <nvbench/nvbench.cuh>
1820

19-
#include <random>
2021
#include <thrust/device_vector.h>
2122

22-
#include "cuco/static_multimap.cuh"
23-
2423
/**
2524
* @brief Generates input keys by a given number of repetitions per key.
2625
*

‎benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <random>
17+
#include <key_generator.hpp>
18+
19+
#include <cuco/static_multimap.cuh>
1820

1921
#include <nvbench/nvbench.cuh>
22+
2023
#include <thrust/device_vector.h>
2124
#include <thrust/iterator/discard_iterator.h>
2225

23-
#include <cuco/static_multimap.cuh>
24-
#include <key_generator.hpp>
25-
2626
namespace {
2727
// Custom pair equal
2828
template <typename Key, typename Value>

‎benchmarks/hash_table/static_multimap/query_bench.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <random>
17+
#include <key_generator.hpp>
18+
19+
#include <cuco/static_multimap.cuh>
1820

1921
#include <nvbench/nvbench.cuh>
20-
#include <thrust/device_vector.h>
2122

22-
#include <cuco/static_multimap.cuh>
23-
#include <key_generator.hpp>
23+
#include <thrust/device_vector.h>
2424

2525
/**
2626
* @brief A benchmark evaluating multi-value query (`count` + `retrieve`) performance:

‎benchmarks/hash_table/static_multimap/retrieve_bench.cu‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <cuco/static_multimap.cuh>
1817
#include <key_generator.hpp>
1918

20-
#include <thrust/device_vector.h>
19+
#include <cuco/static_multimap.cuh>
2120

2221
#include <nvbench/nvbench.cuh>
2322

24-
#include <random>
23+
#include <thrust/device_vector.h>
2524

2625
/**
2726
* @brief A benchmark evaluating multi-value `retrieve` performance:

‎benchmarks/synchronization.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, NVIDIA CORPORATION.
2+
* Copyright (c) 2020-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
1818

1919
// Google Benchmark library
2020
#include <benchmark/benchmark.h>
21+
2122
#include <cuda_runtime_api.h>
2223

2324
#define BENCH_CUDA_TRY(call) \
@@ -129,4 +130,4 @@ class cuda_event_timer {
129130
cudaEvent_t stop_;
130131
cudaStream_t stream_;
131132
benchmark::State* p_state;
132-
};
133+
};

‎examples/static_map/custom_type_example.cu‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, NVIDIA CORPORATION.
2+
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include <cuco/static_map.cuh>
18+
1719
#include <thrust/device_vector.h>
1820
#include <thrust/logical.h>
1921
#include <thrust/transform.h>
2022

21-
#include <cuco/static_map.cuh>
22-
2323
// User-defined key type
2424
#ifdef CUCO_NO_INDEPENDENT_THREADS
2525
struct custom_key_type {

‎examples/static_map/static_map_example.cu‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, NVIDIA CORPORATION.
2+
* Copyright (c) 2020-2022, NVIDIA CORPORATION.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <limits>
17+
#include <cuco/static_map.cuh>
1818

1919
#include <thrust/device_vector.h>
2020
#include <thrust/sequence.h>
2121
#include <thrust/transform.h>
2222

23-
#include <cuco/static_map.cuh>
23+
#include <limits>
2424

2525
int main(void)
2626
{

0 commit comments

Comments
 (0)