Skip to content

Commit 6657e23

Browse files
Re-order CG Type
1 parent 8feddca commit 6657e23

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

include/cuco/detail/probing_scheme_impl.inl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ __host__ __device__ constexpr auto linear_probing<CGSize, Hash>::operator()(
120120
Extent upper_bound) const noexcept
121121
{
122122
using size_type = typename Extent::value_type;
123-
using cg_type = cooperative_groups::thread_block_tile<cg_size>;
124123
return detail::probing_iterator<Extent>{
125-
cuco::detail::sanitize_hash<cg_type, size_type>(g, hash_(probe_key)) % upper_bound,
124+
cuco::detail::sanitize_hash<size_type>(g, hash_(probe_key)) % upper_bound,
126125
cg_size,
127126
upper_bound};
128127
}
@@ -164,9 +163,8 @@ __host__ __device__ constexpr auto double_hashing<CGSize, Hash1, Hash2>::operato
164163
Extent upper_bound) const noexcept
165164
{
166165
using size_type = typename Extent::value_type;
167-
using cg_type = cooperative_groups::thread_block_tile<cg_size>;
168166
return detail::probing_iterator<Extent>{
169-
cuco::detail::sanitize_hash<cg_type, size_type>(g, hash1_(probe_key)) % upper_bound,
167+
cuco::detail::sanitize_hash<size_type>(g, hash1_(probe_key)) % upper_bound,
170168
static_cast<size_type>(
171169
(cuco::detail::sanitize_hash<size_type>(hash2_(probe_key)) % (upper_bound / cg_size - 1) +
172170
1) *

include/cuco/detail/utils.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ __host__ __device__ constexpr SizeType sanitize_hash(HashType hash) noexcept
123123
/**
124124
* @brief Converts a given hash value and cg_rank, into a valid (positive) size type.
125125
*
126-
* @tparam CG Cooperative group type
127126
* @tparam SizeType The target type
127+
* @tparam CG Cooperative group type
128128
* @tparam HashType The input type
129129
*
130130
* @return Converted hash value
131131
*/
132-
template <typename CG, typename SizeType, typename HashType>
132+
template <typename SizeType, typename CG, typename HashType>
133133
__device__ constexpr SizeType sanitize_hash(CG const& group, HashType hash) noexcept
134134
{
135135
auto const base_hash = sanitize_hash<SizeType>(hash);

0 commit comments

Comments
 (0)