Skip to content

Commit

Permalink
Separate MurmurHash32 from hash_functions.cuh (#13681)
Browse files Browse the repository at this point in the history
Moves the `MurmurHash32` class definition from `hash_functions.cuh` to a new `murmur32.cuh` file.
Also moves the new file and the `hash_functions.cuh` from `cpp/include/cudf/detail/utilities/` to `cpp/include/cudf/hashing/detail`
The hash functions were redeclared from the `cudf::detail` namespace to the `cudf::hashing::detail` namespace.

The remaining changes are side-effects of making the above changes.
This PR is a follow on to PR #13626 
No new logic or functions have changed. Only internal detail headers have been refactored.

Authors:
  - David Wendt (https://github.com/davidwendt)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Bradley Dice (https://github.com/bdice)
  - Karthikeyan (https://github.com/karthikeyann)

URL: #13681
  • Loading branch information
davidwendt authored Jul 16, 2023
1 parent 2436e0b commit 0784543
Show file tree
Hide file tree
Showing 41 changed files with 624 additions and 600 deletions.
2 changes: 1 addition & 1 deletion conda/recipes/libcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ outputs:
- test -f $PREFIX/include/cudf/detail/groupby.hpp
- test -f $PREFIX/include/cudf/detail/groupby/group_replace_nulls.hpp
- test -f $PREFIX/include/cudf/detail/groupby/sort_helper.hpp
- test -f $PREFIX/include/cudf/detail/hashing.hpp
- test -f $PREFIX/include/cudf/detail/interop.hpp
- test -f $PREFIX/include/cudf/detail/is_element_valid.hpp
- test -f $PREFIX/include/cudf/detail/join.hpp
Expand Down Expand Up @@ -192,6 +191,7 @@ outputs:
- test -f $PREFIX/include/cudf/fixed_point/temporary.hpp
- test -f $PREFIX/include/cudf/groupby.hpp
- test -f $PREFIX/include/cudf/hashing.hpp
- test -f $PREFIX/include/cudf/hashing/detail/hashing.hpp
- test -f $PREFIX/include/cudf/interop.hpp
- test -f $PREFIX/include/cudf/io/avro.hpp
- test -f $PREFIX/include/cudf/io/csv.hpp
Expand Down
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ add_library(
src/groupby/sort/sort_helper.cu
src/hash/hashing.cu
src/hash/md5_hash.cu
src/hash/murmur_hash.cu
src/hash/spark_murmur_hash.cu
src/hash/murmurhash3_x86_32.cu
src/hash/spark_murmurhash3_x86_32.cu
src/interop/dlpack.cpp
src/interop/from_arrow.cu
src/interop/to_arrow.cu
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/aggregation/result_cache.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <cudf/column/column.hpp>
#include <cudf/detail/aggregation/aggregation.hpp>
#include <cudf/detail/hashing.hpp>
#include <cudf/hashing/detail/hashing.hpp>
#include <cudf/types.hpp>

#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/join.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#pragma once

#include <cudf/column/column.hpp>
#include <cudf/detail/utilities/hash_functions.cuh>
#include <cudf/hashing.hpp>
#include <cudf/table/table_view.hpp>
#include <cudf/types.hpp>
#include <cudf/utilities/default_stream.hpp>
Expand Down
Loading

0 comments on commit 0784543

Please sign in to comment.