diff --git a/cpp/cmake/thirdparty/get_cumlprims_mg.cmake b/cpp/cmake/thirdparty/get_cumlprims_mg.cmake index 0bbc91fc17..805188b2e2 100644 --- a/cpp/cmake/thirdparty/get_cumlprims_mg.cmake +++ b/cpp/cmake/thirdparty/get_cumlprims_mg.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021-2022, NVIDIA CORPORATION. +# Copyright (c) 2021-2025, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,14 +15,13 @@ #============================================================================= set(CUML_MIN_VERSION_cumlprims_mg "${CUML_VERSION_MAJOR}.${CUML_VERSION_MINOR}.00") -set(CUML_BRANCH_VERSION_cumlprims_mg "${CUML_VERSION_MAJOR}.${CUML_VERSION_MINOR}") function(find_and_configure_cumlprims_mg) set(oneValueArgs VERSION FORK PINNED_TAG BUILD_STATIC EXCLUDE_FROM_ALL CLONE_ON_PIN) cmake_parse_arguments(PKG "" "${oneValueArgs}" "" ${ARGN} ) - if(PKG_CLONE_ON_PIN AND NOT PKG_PINNED_TAG STREQUAL "branch-${CUML_BRANCH_VERSION_cumlprims_mg}") + if(PKG_CLONE_ON_PIN AND NOT PKG_PINNED_TAG STREQUAL "${rapids-cmake-checkout-tag}") message("Pinned tag found: ${PKG_PINNED_TAG}. Cloning cumlprims locally.") set(CPM_DOWNLOAD_cumlprims_mg ON) elseif(PKG_BUILD_STATIC AND (NOT CPM_cumlprims_mg_SOURCE)) @@ -64,7 +63,7 @@ endfunction() ### find_and_configure_cumlprims_mg(VERSION ${CUML_MIN_VERSION_cumlprims_mg} FORK rapidsai - PINNED_TAG branch-${CUML_BRANCH_VERSION_cumlprims_mg} + PINNED_TAG ${rapids-cmake-checkout-tag} BUILD_STATIC ${CUML_USE_CUMLPRIMS_MG_STATIC} EXCLUDE_FROM_ALL ${CUML_EXCLUDE_CUMLPRIMS_MG_FROM_ALL} # When PINNED_TAG above doesn't match cuml, diff --git a/cpp/cmake/thirdparty/get_cuvs.cmake b/cpp/cmake/thirdparty/get_cuvs.cmake index 7a2b5f3571..d22a93eed9 100644 --- a/cpp/cmake/thirdparty/get_cuvs.cmake +++ b/cpp/cmake/thirdparty/get_cuvs.cmake @@ -15,14 +15,13 @@ #============================================================================= set(CUML_MIN_VERSION_cuvs "${CUML_VERSION_MAJOR}.${CUML_VERSION_MINOR}.00") -set(CUML_BRANCH_VERSION_cuvs "${CUML_VERSION_MAJOR}.${CUML_VERSION_MINOR}") function(find_and_configure_cuvs) set(oneValueArgs VERSION FORK PINNED_TAG EXCLUDE_FROM_ALL USE_CUVS_STATIC COMPILE_LIBRARY CLONE_ON_PIN) cmake_parse_arguments(PKG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) - if(PKG_CLONE_ON_PIN AND NOT PKG_PINNED_TAG STREQUAL "branch-${CUML_BRANCH_VERSION_cuvs}") + if(PKG_CLONE_ON_PIN AND NOT PKG_PINNED_TAG STREQUAL "${rapids-cmake-checkout-tag}") message(STATUS "CUML: CUVS pinned tag found: ${PKG_PINNED_TAG}. Cloning cuvs locally.") set(CPM_DOWNLOAD_cuvs ON) elseif(PKG_USE_CUVS_STATIC AND (NOT CPM_cuvs_SOURCE)) @@ -74,7 +73,7 @@ endfunction() # CPM_cuvs_SOURCE=/path/to/local/cuvs find_and_configure_cuvs(VERSION ${CUML_MIN_VERSION_cuvs} FORK rapidsai - PINNED_TAG branch-${CUML_BRANCH_VERSION_cuvs} + PINNED_TAG ${rapids-cmake-checkout-tag} EXCLUDE_FROM_ALL ${CUML_EXCLUDE_CUVS_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local cuvs clone in build directory diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 94c8392d9a..bbcbc674f6 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -15,14 +15,13 @@ #============================================================================= set(CUML_MIN_VERSION_raft "${CUML_VERSION_MAJOR}.${CUML_VERSION_MINOR}.00") -set(CUML_BRANCH_VERSION_raft "${CUML_VERSION_MAJOR}.${CUML_VERSION_MINOR}") function(find_and_configure_raft) set(oneValueArgs VERSION FORK PINNED_TAG EXCLUDE_FROM_ALL USE_RAFT_STATIC COMPILE_LIBRARY CLONE_ON_PIN NVTX) cmake_parse_arguments(PKG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) - if(PKG_CLONE_ON_PIN AND NOT PKG_PINNED_TAG STREQUAL "branch-${CUML_BRANCH_VERSION_raft}") + if(PKG_CLONE_ON_PIN AND NOT PKG_PINNED_TAG STREQUAL "${rapids-cmake-checkout-tag}") message(STATUS "CUML: RAFT pinned tag found: ${PKG_PINNED_TAG}. Cloning raft locally.") set(CPM_DOWNLOAD_raft ON) elseif(PKG_USE_RAFT_STATIC AND (NOT CPM_raft_SOURCE)) @@ -73,7 +72,7 @@ endfunction() # 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} + PINNED_TAG ${rapids-cmake-checkout-tag} EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory