From 770e9be3868078246eb0be38cf597d2fe1500ded Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Tue, 9 May 2023 15:14:16 -0700 Subject: [PATCH 1/9] Test out https://github.com/rapidsai/raft/pull/1498 --- cpp/cmake/thirdparty/get_raft.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 24b2db76ea..4354f102b6 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -85,8 +85,8 @@ 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 benfred + PINNED_TAG remove_deprecated_matrix_cuh EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory From bbc2d4d122d9c5e45ed3f3c2a52ffa6912d959d3 Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Tue, 9 May 2023 16:20:14 -0700 Subject: [PATCH 2/9] add missing include --- cpp/src/hdbscan/detail/soft_clustering.cuh | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/src/hdbscan/detail/soft_clustering.cuh b/cpp/src/hdbscan/detail/soft_clustering.cuh index b895462fef..85a9c4b9f4 100644 --- a/cpp/src/hdbscan/detail/soft_clustering.cuh +++ b/cpp/src/hdbscan/detail/soft_clustering.cuh @@ -37,6 +37,7 @@ #include #include #include +#include #include #include From 26aedc94d71908bbe81967e2a836ac211325c1fd Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Tue, 9 May 2023 22:53:05 -0700 Subject: [PATCH 3/9] retrigger ci From 1cafa92d54be9e4081953f0496e4cc71f8811053 Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Wed, 10 May 2023 10:19:36 -0700 Subject: [PATCH 4/9] retrigger ci From b98500fea97a9233e5900c628387116e02a6053d Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Wed, 10 May 2023 10:20:33 -0700 Subject: [PATCH 5/9] retrigger ci From 1d6adcd9a203cd177fdc33665cebddc96acc0f59 Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Wed, 10 May 2023 13:00:13 -0700 Subject: [PATCH 6/9] retrigger ci From 0a6d4a57043e1d496166a3b50bac512639f08099 Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Wed, 10 May 2023 15:56:12 -0700 Subject: [PATCH 7/9] retrigger ci From 10cd15ce9df4c8923b086445b645fa28d8bd5222 Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Wed, 10 May 2023 19:14:04 -0700 Subject: [PATCH 8/9] remove pin --- cpp/cmake/thirdparty/get_raft.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 4354f102b6..24b2db76ea 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -85,8 +85,8 @@ 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 benfred - PINNED_TAG remove_deprecated_matrix_cuh + FORK rapidsai + PINNED_TAG branch-${CUML_BRANCH_VERSION_raft} EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory From 73741b5b49843656be9c6dc1941f0c9cc2e6bcaf Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Wed, 10 May 2023 21:42:13 -0700 Subject: [PATCH 9/9] retrigger ci