Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix passing seed parameter to MurmurHash3_32 in cudf::hash() function #12875

Merged
merged 8 commits into from
Mar 13, 2023
Merged

Fix passing seed parameter to MurmurHash3_32 in cudf::hash() function #12875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46ced7a
Fix passing seed parameter to MurmurhHash3_32 in cudf::hash() function
davidwendt Mar 2, 2023
998e6fa
Merge branch 'branch-23.04' into hash-string-variance
davidwendt Mar 2, 2023
7d7d35b
remove temp gtest
davidwendt Mar 2, 2023
0c8967c
Merge branch 'branch-23.04' into hash-string-variance
davidwendt Mar 5, 2023
a19d648
Merge branch 'branch-23.04' into hash-string-variance
bdice Mar 8, 2023
3f416af
Merge branch 'hash-string-variance' of github.com:davidwendt/cudf int…
davidwendt Mar 9, 2023
05df057
Merge branch 'branch-23.04' into hash-string-variance
davidwendt Mar 9, 2023
96c3a24
Merge branch 'branch-23.04' into hash-string-variance
davidwendt Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions cpp/include/cudf/table/experimental/row_operators.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,10 @@ class device_row_hasher {
{
auto it = thrust::make_transform_iterator(_table.begin(), [=](auto const& column) {
return cudf::type_dispatcher<dispatch_storage_type>(
column.type(), element_hasher_adapter<hash_function>{_check_nulls}, column, row_index);
column.type(),
element_hasher_adapter<hash_function>{_check_nulls, _seed},
column,
row_index);
});

// Hash each element and combine all the hash values together
Expand All @@ -1736,8 +1739,8 @@ class device_row_hasher {
static constexpr hash_value_type NON_NULL_HASH = 0;

public:
__device__ element_hasher_adapter(Nullate check_nulls) noexcept
: _element_hasher(check_nulls), _check_nulls(check_nulls)
__device__ element_hasher_adapter(Nullate check_nulls, uint32_t seed) noexcept
: _element_hasher(check_nulls, seed), _check_nulls(check_nulls)
{
}

Expand Down
80 changes: 40 additions & 40 deletions cpp/tests/hashing/hash_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2022, NVIDIA CORPORATION.
* Copyright (c) 2019-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -152,16 +152,16 @@ TEST_F(HashTest, BasicList)

auto const expect_seeded = ICW{1607594268u,
1607594268u,
3658958173u,
4162508905u,
3658958173u,
2286117305u,
3271180885u,
761198477u,
761198477u,
1340178469u,
3271180885u,
3271180885u};
1576790066u,
1203671017u,
1576790066u,
2107478077u,
1756855002u,
2228938758u,
2228938758u,
3491134126u,
1756855002u,
1756855002u};

auto const seeded_output = cudf::hash(input, cudf::hash_id::HASH_MURMUR3, 15);
CUDF_TEST_EXPECT_COLUMNS_EQUAL(expect_seeded, seeded_output->view(), verbosity);
Expand Down Expand Up @@ -192,14 +192,14 @@ TEST_F(HashTest, NullableList)

auto const expect_seeded = ICW{2271820643u,
2271820643u,
4263297392u,
4263297392u,
3089720935u,
1865775808u,
1865775808u,
1038318696u,
1038318696u,
595138041u,
3027840870u,
3027840870u,
2271820578u,
3089720935u,
3089720935u,
595138041u,
595138041u,
2271820578u};

auto const seeded_output = cudf::hash(cudf::table_view({col}), cudf::hash_id::HASH_MURMUR3, 31);
Expand Down Expand Up @@ -256,14 +256,14 @@ TEST_F(HashTest, ListOfStruct)
3642097855u,
3642097855u,
3642110391u,
3624905718u,
608933631u,
1899376347u,
1899376347u,
2058877614u,
2058877614u,
4013395891u,
4013395891u};
3889855760u,
1494406307u,
103934081u,
103934081u,
3462063680u,
3462063680u,
1696730835u,
1696730835u};

auto const seeded_output =
cudf::hash(cudf::table_view({*list_column}), cudf::hash_id::HASH_MURMUR3, 619);
Expand Down Expand Up @@ -303,19 +303,19 @@ TEST_F(HashTest, ListOfEmptyStruct)
cudf::UNKNOWN_NULL_COUNT,
std::move(list_validity_buffer));

auto expect = cudf::test::fixed_width_column_wrapper<uint32_t>{-2023148619,
-2023148619,
-2023148682,
-2023148682,
-340558283,
-340558283,
-340558283,
-1999301021,
-1999301021,
-1999301020,
-1999301020,
-340558244,
-340558244};
auto expect = cudf::test::fixed_width_column_wrapper<uint32_t>{2271818677u,
2271818677u,
2271818614u,
2271818614u,
3954409013u,
3954409013u,
3954409013u,
2295666275u,
2295666275u,
2295666276u,
2295666276u,
3954409052u,
3954409052u};

auto output = cudf::hash(cudf::table_view({*list_column}));
CUDF_TEST_EXPECT_COLUMNS_EQUAL(expect, output->view(), verbosity);
Expand Down Expand Up @@ -343,7 +343,7 @@ TEST_F(HashTest, EmptyDeepList)
std::move(list_validity_buffer));

auto expect = cudf::test::fixed_width_column_wrapper<uint32_t>{
-2023148619, -2023148619, -2023148682, -2023148682};
2271818677u, 2271818677u, 2271818614u, 2271818614u};

auto output = cudf::hash(cudf::table_view({*list_column}));
CUDF_TEST_EXPECT_COLUMNS_EQUAL(expect, output->view(), verbosity);
Expand Down