diff --git a/cpp/cmake/thirdparty/get_cucollections.cmake b/cpp/cmake/thirdparty/get_cucollections.cmake index b6cb9757ae8..b58bdb55de3 100644 --- a/cpp/cmake/thirdparty/get_cucollections.cmake +++ b/cpp/cmake/thirdparty/get_cucollections.cmake @@ -21,7 +21,7 @@ function(find_and_configure_cucollections) cuco 0.0 GLOBAL_TARGETS cuco::cuco CPM_ARGS GITHUB_REPOSITORY NVIDIA/cuCollections - GIT_TAG f0eecb203590f1f4ac4a9f1700229f4434ac64dc + GIT_TAG 6433e8ad7571f14cc5384051b049029c60dd1ce0 OPTIONS "BUILD_TESTS OFF" "BUILD_BENCHMARKS OFF" "BUILD_EXAMPLES OFF" ) diff --git a/cpp/src/join/hash_join.cu b/cpp/src/join/hash_join.cu index c5b680f129e..421761b341b 100644 --- a/cpp/src/join/hash_join.cu +++ b/cpp/src/join/hash_join.cu @@ -293,7 +293,8 @@ hash_join::hash_join_impl::hash_join_impl(cudf::table_view const& build, _hash_table{compute_hash_table_size(build.num_rows()), std::numeric_limits::max(), cudf::detail::JoinNoneValue, - stream.value()} + stream.value(), + detail::hash_table_allocator_type{default_allocator{}, stream}} { CUDF_FUNC_RANGE(); CUDF_EXPECTS(0 != build.num_columns(), "Hash join build table is empty"); diff --git a/cpp/src/join/join_common_utils.hpp b/cpp/src/join/join_common_utils.hpp index d6eb5e93a98..8e76def72e1 100644 --- a/cpp/src/join/join_common_utils.hpp +++ b/cpp/src/join/join_common_utils.hpp @@ -15,11 +15,15 @@ */ #pragma once +#include #include #include #include -#include +#include +#include + +#include #include @@ -38,11 +42,13 @@ using pair_type = cuco::pair_type; using hash_type = cuco::detail::MurmurHash3_32; +using hash_table_allocator_type = rmm::mr::stream_allocator_adaptor>; + using multimap_type = cuco::static_multimap, + hash_table_allocator_type, cuco::double_hashing>; using row_hash = cudf::row_hasher;