From a9027e452ab3a37e4584b5aa2bb88139486556e0 Mon Sep 17 00:00:00 2001 From: Yunsong Wang Date: Tue, 19 Nov 2024 11:58:32 -0800 Subject: [PATCH] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel Jünger --- tests/static_map/capacity_test.cu | 2 +- tests/static_map/custom_type_test.cu | 2 +- tests/static_map/heterogeneous_lookup_test.cu | 2 +- tests/static_map/insert_or_assign_test.cu | 2 +- tests/static_map/rehash_test.cu | 2 +- tests/static_multimap/custom_pair_retrieve_test.cu | 2 +- tests/static_multimap/custom_type_test.cu | 2 +- tests/static_multimap/heterogeneous_lookup_test.cu | 2 +- tests/static_multimap/pair_function_test.cu | 2 +- tests/static_set/capacity_test.cu | 2 +- tests/static_set/heterogeneous_lookup_test.cu | 2 +- tests/static_set/rehash_test.cu | 2 +- tests/static_set/retrieve_test.cu | 2 +- tests/static_set/shared_memory_test.cu | 4 ++-- tests/static_set/size_test.cu | 2 +- tests/static_set/unique_sequence_test.cu | 2 +- tests/utility/hash_test.cu | 8 ++++---- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/static_map/capacity_test.cu b/tests/static_map/capacity_test.cu index cefde4fdd..441415eb3 100644 --- a/tests/static_map/capacity_test.cu +++ b/tests/static_map/capacity_test.cu @@ -18,7 +18,7 @@ #include -TEST_CASE("static_map capacity", "") +TEST_CASE("static_map capacity test", "") { using Key = int32_t; using T = int32_t; diff --git a/tests/static_map/custom_type_test.cu b/tests/static_map/custom_type_test.cu index 14fb75e79..9b8361b4d 100644 --- a/tests/static_map/custom_type_test.cu +++ b/tests/static_map/custom_type_test.cu @@ -98,7 +98,7 @@ struct custom_key_equals { } }; -TEMPLATE_TEST_CASE_SIG("static_map custom key and value type", +TEMPLATE_TEST_CASE_SIG("static_map custom key and value type tests", "", ((typename Key, typename Value), Key, Value), #if defined(CUCO_HAS_INDEPENDENT_THREADS) // Key type larger than 8B only supported for sm_70 and diff --git a/tests/static_map/heterogeneous_lookup_test.cu b/tests/static_map/heterogeneous_lookup_test.cu index 54a23d262..8ba2d22ba 100644 --- a/tests/static_map/heterogeneous_lookup_test.cu +++ b/tests/static_map/heterogeneous_lookup_test.cu @@ -82,7 +82,7 @@ struct custom_key_equal { } }; -TEMPLATE_TEST_CASE_SIG("static_map heterogeneous lookup", +TEMPLATE_TEST_CASE_SIG("static_map heterogeneous lookup tests", "", ((typename T, int CGSize), T, CGSize), #if defined(CUCO_HAS_INDEPENDENT_THREADS) // Key type larger than 8B only supported for sm_70 and diff --git a/tests/static_map/insert_or_assign_test.cu b/tests/static_map/insert_or_assign_test.cu index c850d0594..7c82f0817 100644 --- a/tests/static_map/insert_or_assign_test.cu +++ b/tests/static_map/insert_or_assign_test.cu @@ -71,7 +71,7 @@ void test_insert_or_assign(Map& map, size_type num_keys) } TEMPLATE_TEST_CASE_SIG( - "static_map insert_or_assign", + "static_map insert_or_assign tests", "", ((typename Key, typename Value, cuco::test::probe_sequence Probe, int CGSize), Key, diff --git a/tests/static_map/rehash_test.cu b/tests/static_map/rehash_test.cu index 1ec957c57..62e3355e5 100644 --- a/tests/static_map/rehash_test.cu +++ b/tests/static_map/rehash_test.cu @@ -22,7 +22,7 @@ #include -TEST_CASE("static_map rehash", "") +TEST_CASE("static_map rehash test", "") { using key_type = int; using mapped_type = long; diff --git a/tests/static_multimap/custom_pair_retrieve_test.cu b/tests/static_multimap/custom_pair_retrieve_test.cu index 651bec947..ebfb35c61 100644 --- a/tests/static_multimap/custom_pair_retrieve_test.cu +++ b/tests/static_multimap/custom_pair_retrieve_test.cu @@ -188,7 +188,7 @@ void test_non_shmem_pair_retrieve(Map& map, std::size_t const num_pairs) } TEMPLATE_TEST_CASE_SIG( - "static_multimap non-shared-memory pair_retrieve", + "static_multimap non-shared-memory pair_retrieve tests", "", ((typename Key, typename Value, cuco::test::probe_sequence Probe), Key, Value, Probe), (int32_t, int32_t, cuco::test::probe_sequence::linear_probing), diff --git a/tests/static_multimap/custom_type_test.cu b/tests/static_multimap/custom_type_test.cu index 1e558507e..9d1a7b98f 100644 --- a/tests/static_multimap/custom_type_test.cu +++ b/tests/static_multimap/custom_type_test.cu @@ -208,7 +208,7 @@ void test_custom_key_value_type(Map& map, std::size_t num_pairs) } } -TEMPLATE_TEST_CASE_SIG("static_multimap user defined key and value type", +TEMPLATE_TEST_CASE_SIG("static_multimap user defined key and value type tests", "", ((cuco::test::probe_sequence Probe), Probe), (cuco::test::probe_sequence::linear_probing), diff --git a/tests/static_multimap/heterogeneous_lookup_test.cu b/tests/static_multimap/heterogeneous_lookup_test.cu index 9a8e37e5a..ead1bae59 100644 --- a/tests/static_multimap/heterogeneous_lookup_test.cu +++ b/tests/static_multimap/heterogeneous_lookup_test.cu @@ -80,7 +80,7 @@ struct custom_key_equal { } }; -TEMPLATE_TEST_CASE("static_multimap heterogeneous lookup", +TEMPLATE_TEST_CASE("static_multimap heterogeneous lookup tests", "", #if defined(CUCO_HAS_INDEPENDENT_THREADS) // Key type larger than 8B only supported for sm_70 and // up diff --git a/tests/static_multimap/pair_function_test.cu b/tests/static_multimap/pair_function_test.cu index 6c759e7e2..5e86f2052 100644 --- a/tests/static_multimap/pair_function_test.cu +++ b/tests/static_multimap/pair_function_test.cu @@ -108,7 +108,7 @@ void test_pair_functions(Map& map, PairIt pair_begin, std::size_t num_pairs) } TEMPLATE_TEST_CASE_SIG( - "static_multimap pair functions", + "static_multimap pair functions tests", "", ((typename Key, typename Value, cuco::test::probe_sequence Probe), Key, Value, Probe), (int32_t, int32_t, cuco::test::probe_sequence::linear_probing), diff --git a/tests/static_set/capacity_test.cu b/tests/static_set/capacity_test.cu index 85f11ad0b..f1f2e5ba1 100644 --- a/tests/static_set/capacity_test.cu +++ b/tests/static_set/capacity_test.cu @@ -18,7 +18,7 @@ #include -TEST_CASE("static_set capacity", "") +TEST_CASE("static_set capacity test", "") { using Key = int32_t; using ProbeT = cuco::double_hashing<1, cuco::default_hash_function>; diff --git a/tests/static_set/heterogeneous_lookup_test.cu b/tests/static_set/heterogeneous_lookup_test.cu index 377ee5fcf..463184cf1 100644 --- a/tests/static_set/heterogeneous_lookup_test.cu +++ b/tests/static_set/heterogeneous_lookup_test.cu @@ -82,7 +82,7 @@ struct custom_key_equal { } }; -TEMPLATE_TEST_CASE_SIG("static_set heterogeneous lookup", +TEMPLATE_TEST_CASE_SIG("static_set heterogeneous lookup tests", "", ((typename T, int CGSize), T, CGSize), (int32_t, 1), diff --git a/tests/static_set/rehash_test.cu b/tests/static_set/rehash_test.cu index 19b210ee0..e2078d183 100644 --- a/tests/static_set/rehash_test.cu +++ b/tests/static_set/rehash_test.cu @@ -21,7 +21,7 @@ #include -TEST_CASE("static_set rehash", "") +TEST_CASE("static_set rehash test", "") { using key_type = int; diff --git a/tests/static_set/retrieve_test.cu b/tests/static_set/retrieve_test.cu index 9509cd76c..3c054ba6f 100644 --- a/tests/static_set/retrieve_test.cu +++ b/tests/static_set/retrieve_test.cu @@ -73,7 +73,7 @@ void test_unique_sequence(Set& set, std::size_t num_keys) } TEMPLATE_TEST_CASE_SIG( - "static_set retrieve", + "static_set retrieve tests", "", ((typename Key, cuco::test::probe_sequence Probe, int CGSize), Key, Probe, CGSize), (int32_t, cuco::test::probe_sequence::double_hashing, 1), diff --git a/tests/static_set/shared_memory_test.cu b/tests/static_set/shared_memory_test.cu index 1cbb3c1f5..218fa0a64 100644 --- a/tests/static_set/shared_memory_test.cu +++ b/tests/static_set/shared_memory_test.cu @@ -64,7 +64,7 @@ __global__ void shared_memory_test_kernel(Ref* sets, } } -TEMPLATE_TEST_CASE_SIG("static_set shared memory", "", ((typename Key), Key), (int32_t), (int64_t)) +TEMPLATE_TEST_CASE_SIG("static_set shared memory tests", "", ((typename Key), Key), (int32_t), (int64_t)) { constexpr std::size_t number_of_sets = 1000; constexpr std::size_t elements_in_set = 500; @@ -187,7 +187,7 @@ __global__ void shared_memory_hash_set_kernel(bool* key_found) if (retrieved_it != find_ref.end() && *retrieved_it == rank) { key_found[index] = true; } } -TEST_CASE("static_set shared memory slots.", "") +TEST_CASE("static_set shared memory slots test", "") { constexpr std::size_t N = 256; [[maybe_unused]] auto constexpr num_windows = diff --git a/tests/static_set/size_test.cu b/tests/static_set/size_test.cu index c28af3a97..1b087a566 100644 --- a/tests/static_set/size_test.cu +++ b/tests/static_set/size_test.cu @@ -22,7 +22,7 @@ #include -TEST_CASE("static_set size computation", "") +TEST_CASE("static_set size test", "") { constexpr std::size_t num_keys{400}; diff --git a/tests/static_set/unique_sequence_test.cu b/tests/static_set/unique_sequence_test.cu index b435d874a..ba9161169 100644 --- a/tests/static_set/unique_sequence_test.cu +++ b/tests/static_set/unique_sequence_test.cu @@ -136,7 +136,7 @@ void test_unique_sequence(Set& set, size_type num_keys) } TEMPLATE_TEST_CASE_SIG( - "static_set unique sequence", + "static_set unique sequence tests", "", ((typename Key, cuco::test::probe_sequence Probe, int CGSize), Key, Probe, CGSize), (int32_t, cuco::test::probe_sequence::double_hashing, 1), diff --git a/tests/utility/hash_test.cu b/tests/utility/hash_test.cu index e8b388924..665ba1d85 100644 --- a/tests/utility/hash_test.cu +++ b/tests/utility/hash_test.cu @@ -67,7 +67,7 @@ __global__ void check_identity_hash_result_kernel(OutputIter result) cuda::std::numeric_limits::max(), cuda::std::numeric_limits::max()); } -TEST_CASE("utility cuco::identity_hash tests", "") +TEST_CASE("utility cuco::identity_hash test", "") { SECTION("Check if host-generated hash values match the identity function.") { @@ -121,7 +121,7 @@ __global__ void check_hash_result_kernel_64(OutputIter result) check_hash_result>>(123456789, 2031761887105658523, 0); } -TEST_CASE("utility cuco::xxhash_64 tests", "") +TEST_CASE("utility cuco::xxhash_64 test", "") { // Reference hash values were computed using https://github.com/Cyan4973/xxHash SECTION("Check if host-generated hash values match the reference implementation.") @@ -184,7 +184,7 @@ __global__ void check_hash_result_kernel_32(OutputIter result) result[i++] = check_hash_result>>(123456789, 3715432378, 0); } -TEST_CASE("utility cuco::xxhash_32 tests", "") +TEST_CASE("utility cuco::xxhash_32 test", "") { // Reference hash values were computed using https://github.com/Cyan4973/xxHash SECTION("Check if host-generated hash values match the reference implementation.") @@ -323,7 +323,7 @@ __global__ void check_murmurhash3_128_result_kernel(OutputIter result) 1024); } -TEST_CASE("utility cuco::murmurhash3_x64_128 tests", "") +TEST_CASE("utility cuco::murmurhash3_x64_128 test", "") { // Reference hash values were computed using // https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp