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

Update cuco version #714

Merged
merged 3 commits into from
Jun 17, 2022
Merged

Update cuco version #714

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be8cf26
Update cuco hash.
vyasr Jun 16, 2022
903a475
Update sentinel types.
vyasr Jun 16, 2022
e70c061
Fix formatting.
vyasr Jun 16, 2022
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
2 changes: 1 addition & 1 deletion cpp/cmake/thirdparty/get_cuco.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function(find_and_configure_cuco VERSION)
INSTALL_EXPORT_SET raft-distance-lib-exports
CPM_ARGS
GIT_REPOSITORY https://github.com/NVIDIA/cuCollections.git
GIT_TAG 6ec8b6dcdeceea07ab4456d32461a05c18864411
GIT_TAG 55029034c3f82bca36148c9be29941b37492394d
OPTIONS "BUILD_TESTS OFF"
"BUILD_BENCHMARKS OFF"
"BUILD_EXAMPLES OFF"
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/raft/sparse/distance/detail/coo_spmv_strategies/hash_strategy.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class hash_strategy : public coo_spmv_strategy<value_idx, value_t, tpb> {
__device__ inline insert_type init_insert(smem_type cache, const value_idx& cache_size)
{
return insert_type::make_from_uninitialized_slots(
cooperative_groups::this_thread_block(), cache, cache_size, -1, 0);
cooperative_groups::this_thread_block(), cache, cache_size, cuco::sentinel::empty_key{value_idx{-1}}, cuco::sentinel::empty_value{value_t{0}});
}

__device__ inline void insert(insert_type cache, const value_idx& key, const value_t& value)
Expand All @@ -237,7 +237,7 @@ class hash_strategy : public coo_spmv_strategy<value_idx, value_t, tpb> {

__device__ inline find_type init_find(smem_type cache, const value_idx& cache_size)
{
return find_type(cache, cache_size, -1, 0);
return find_type(cache, cache_size, cuco::sentinel::empty_key{value_idx{-1}}, cuco::sentinel::empty_value{value_t{0}});
}

__device__ inline value_t find(find_type cache, const value_idx& key)
Expand Down