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

verifying cusparse wrapper revert passes CI #4990

Merged
merged 10 commits into from
Nov 10, 2022
Merged

verifying cusparse wrapper revert passes CI #4990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aefdc68
Use RAFT with updated cusparse wrappers
wphicks Nov 4, 2022
388cd8f
Update RAFT commit
wphicks Nov 4, 2022
58dc7df
Bump RAFT commit
wphicks Nov 7, 2022
606d3e8
Don't CLONE_ON_PIN for cuml python
cjnolet Nov 9, 2022
e66bfcd
Updating branch
cjnolet Nov 9, 2022
3944a6d
iFixing argmax call
cjnolet Nov 9, 2022
76c9039
Fixing style
cjnolet Nov 9, 2022
a406fdc
Reverting pin
cjnolet Nov 9, 2022
1c3aa08
Fixing branch
cjnolet Nov 9, 2022
2242500
Changing pin to raft
cjnolet Nov 10, 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
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ option(CUDA_STATIC_RUNTIME "Statically link the CUDA toolkit runtime and librari
option(CUML_USE_RAFT_STATIC "Build and statically link the RAFT libraries" OFF)
option(CUML_USE_FAISS_STATIC "Build and statically link the FAISS library for nearest neighbors search on GPU" OFF)
option(CUML_USE_TREELITE_STATIC "Build and statically link the treelite library" OFF)
option(CUML_RAFT_CLONE_ON_PIN "Explicitly clone RAFT branch when pinned to non-feature branch" ON)

message(VERBOSE "CUML_CPP: Building libcuml_c shared library. Contains the cuML C API: ${BUILD_CUML_C_LIBRARY}")
message(VERBOSE "CUML_CPP: Building libcuml shared library: ${BUILD_CUML_CPP_LIBRARY}")
Expand Down
6 changes: 3 additions & 3 deletions cpp/cmake/thirdparty/get_raft.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ endfunction()
# To use a different RAFT locally, set the CMake variable
# CPM_raft_SOURCE=/path/to/local/raft
find_and_configure_raft(VERSION ${CUML_MIN_VERSION_raft}
FORK rapidsai
PINNED_TAG branch-${CUML_BRANCH_VERSION_raft}
FORK cjnolet
PINNED_TAG bug-2212-revert_cusparse_changes

# When PINNED_TAG above doesn't match cuml,
# force local raft clone in build directory
# even if it's already installed.
CLONE_ON_PIN ON
CLONE_ON_PIN ${CUML_RAFT_CLONE_ON_PIN}
USE_RAFT_NN ${CUML_USE_RAFT_NN}
USE_RAFT_DIST ${CUML_USE_RAFT_DIST}
USE_RAFT_STATIC ${CUML_USE_RAFT_STATIC}
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/hdbscan/detail/soft_clustering.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,8 @@ void all_points_prob_in_some_cluster(const raft::handle_t& handle,

rmm::device_uvector<value_t> height_argmax(m, stream);

raft::matrix::argmax(merge_heights, n_selected_clusters, m, height_argmax.data(), stream);
raft::matrix::argmax(
merge_heights, n_selected_clusters, static_cast<int>(m), height_argmax.data(), stream);

int n_blocks = raft::ceildiv((int)m, tpb);
prob_in_some_cluster_kernel<<<n_blocks, tpb, 0, stream>>>(merge_heights,
Expand Down
1 change: 1 addition & 0 deletions python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ project(
# - User Options --------------------------------------------------------------
option(FIND_CUML_CPP "Search for existing CUML C++ installations before defaulting to local files" OFF)
option(SINGLEGPU "Disable all mnmg components and comms libraries" OFF)
set(CUML_RAFT_CLONE_ON_PIN OFF)

# todo: use CMAKE_MESSAGE_CONTEXT for prefix for logging.
# https://github.com/rapidsai/cuml/issues/4843
Expand Down