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

Jump to bottom

Update raft for compatibility with the latest cuco #2118

Merged
merged 9 commits into from
Feb 16, 2024
Merged

Update raft for compatibility with the latest cuco #2118

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9015bfd
Custom cuco version
PointKernel Feb 5, 2024
204a542
Update cuco-related code
PointKernel Feb 5, 2024
3334de7
Fix typos
PointKernel Feb 5, 2024
cdba47d
Merge branch 'branch-24.04' into fix-cuco-conflicts
PointKernel Feb 9, 2024
d305ae0
Merge branch 'branch-24.04' into fix-cuco-conflicts
PointKernel Feb 9, 2024
d7953ea
Merge branch 'branch-24.04' into fix-cuco-conflicts
PointKernel Feb 13, 2024
e698116
Merge remote-tracking branch 'upstream/branch-24.04' into fix-cuco-co…
PointKernel Feb 15, 2024
9b49ec5
Revert CMake changes
PointKernel Feb 15, 2024
9dd514c
Merge remote-tracking branch 'origin/fix-cuco-conflicts' into fix-cuc…
PointKernel Feb 15, 2024
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
8 changes: 4 additions & 4 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
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023, NVIDIA CORPORATION.
* Copyright (c) 2021-2024, 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 @@ -43,11 +43,11 @@ namespace detail {
template <typename value_idx, typename value_t, int tpb>
class hash_strategy : public coo_spmv_strategy<value_idx, value_t, tpb> {
public:
using insert_type =
typename cuco::static_map<value_idx, value_t, cuda::thread_scope_block>::device_mutable_view;
using insert_type = typename cuco::legacy::
static_map<value_idx, value_t, cuda::thread_scope_block>::device_mutable_view;
using smem_type = typename insert_type::slot_type*;
using find_type =
typename cuco::static_map<value_idx, value_t, cuda::thread_scope_block>::device_view;
typename cuco::legacy::static_map<value_idx, value_t, cuda::thread_scope_block>::device_view;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Legacy- should we be concerned that this feature is no longer supported? Or is there another similar API we can migrate this to.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there another similar API we can migrate this to

Yes, we added a more performant new map and it's ready to use. I can put up a PR afterward for the map migration.


hash_strategy(const distances_config_t<value_idx, value_t>& config_,
float capacity_threshold_ = 0.5,
Expand Down
7 changes: 5 additions & 2 deletions fetch_rapids.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand All @@ -11,10 +11,13 @@
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# =============================================================================

set(rapids-cmake-repo PointKernel/rapids-cmake)
set(rapids-cmake-branch cuco-experimental)

if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake)
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.04/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake
)
endif()

include(${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake)
Loading