From 6a409577c4fb70af592bc6d385d1d23a7040b8e6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 1 Nov 2024 08:14:05 -0500 Subject: [PATCH 1/3] Build with CCCL 2.7.0-rc2. --- cpp/template/cmake/thirdparty/fetch_rapids.cmake | 4 ++++ rapids_config.cmake | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cpp/template/cmake/thirdparty/fetch_rapids.cmake b/cpp/template/cmake/thirdparty/fetch_rapids.cmake index 6f4c627ed4..f008e1d874 100644 --- a/cpp/template/cmake/thirdparty/fetch_rapids.cmake +++ b/cpp/template/cmake/thirdparty/fetch_rapids.cmake @@ -12,6 +12,10 @@ # the License. # Use this variable to update RAPIDS and RAFT versions + +set(rapids-cmake-repo bdice/rapids-cmake) +set(rapids-cmake-branch cccl-2.7.0-rc2) + set(RAPIDS_VERSION "24.12") if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RAFT_RAPIDS.cmake) diff --git a/rapids_config.cmake b/rapids_config.cmake index c8077f7f4b..64b059515f 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -11,6 +11,10 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= + +set(rapids-cmake-repo bdice/rapids-cmake) +set(rapids-cmake-branch cccl-2.7.0-rc2) + file(READ "${CMAKE_CURRENT_LIST_DIR}/VERSION" _rapids_version) if(_rapids_version MATCHES [[^([0-9][0-9])\.([0-9][0-9])\.([0-9][0-9])]]) set(RAPIDS_VERSION_MAJOR "${CMAKE_MATCH_1}") From b59173d4388249f7947f9af65275ea6709879dd1 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 14 Nov 2024 19:40:54 +0000 Subject: [PATCH 2/3] Pin to testing fork of ucxx --- python/raft-dask/cmake/thirdparty/get_ucxx.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/raft-dask/cmake/thirdparty/get_ucxx.cmake b/python/raft-dask/cmake/thirdparty/get_ucxx.cmake index db9b5c6b4d..ae720466e5 100644 --- a/python/raft-dask/cmake/thirdparty/get_ucxx.cmake +++ b/python/raft-dask/cmake/thirdparty/get_ucxx.cmake @@ -48,8 +48,8 @@ endfunction() # To use a different RAFT locally, set the CMake variable # CPM_raft_SOURCE=/path/to/local/raft find_and_configure_ucxx(VERSION 0.41 - FORK rapidsai - PINNED_TAG branch-0.41 + FORK bdice + PINNED_TAG cccl-2.7.0-rc2 EXCLUDE_FROM_ALL YES UCXX_STATIC ${RAFT_DASK_UCXX_STATIC} ) From 62de16c048592b7d2ce56121a6f2672bf82271a6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 3 Dec 2024 21:04:50 +0000 Subject: [PATCH 3/3] Skip expensive tests. --- cpp/test/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index 621ee6c160..85b149a3ed 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -261,10 +261,10 @@ if(BUILD_TESTS) sparse/symmetrize.cu ) - ConfigureTest( - NAME NEIGHBORS_TEST PATH neighbors/haversine.cu neighbors/ball_cover.cu - neighbors/epsilon_neighborhood.cu LIB EXPLICIT_INSTANTIATE_ONLY - ) +# ConfigureTest( +# NAME NEIGHBORS_TEST PATH neighbors/haversine.cu neighbors/ball_cover.cu +# neighbors/epsilon_neighborhood.cu LIB EXPLICIT_INSTANTIATE_ONLY +# ) ConfigureTest( NAME