Remove testing changes

rapidsai · Dec 31, 2024 · 238c961 · 238c961
1 parent e65e48b
commit 238c961
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -17,13 +17,7 @@ rapids-logger "Begin cpp build"
 
 sccache --zero-stats
 
-LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2530 cpp)
-LIBCUVS_CHANNEL=$(rapids-get-pr-conda-artifact cuvs 540 cpp)
-
-RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \
-        --channel "${LIBRAFT_CHANNEL}" \
-        --channel "${LIBCUVS_CHANNEL}" \
-        conda/recipes/libcuml
+RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcuml
 
 sccache --show-adv-stats
 

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -18,9 +18,6 @@ rapids-generate-version > ./VERSION
 rapids-logger "Begin py build"
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
-LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2530 cpp)
-LIBCUVS_CHANNEL=$(rapids-get-pr-conda-artifact cuvs 540 cpp)
-PYRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2530 python)
 
 sccache --zero-stats
 
@@ -29,9 +26,6 @@ sccache --zero-stats
 RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
-  --channel "${LIBRAFT_CHANNEL}" \
-  --channel "${LIBCUVS_CHANNEL}" \
-  --channel "${PYRAFT_CHANNEL}" \
   conda/recipes/cuml
 
 sccache --show-adv-stats

diff --git a/cpp/cmake/thirdparty/get_cuvs.cmake b/cpp/cmake/thirdparty/get_cuvs.cmake
@@ -72,13 +72,13 @@ endfunction()
 # To use a different CUVS locally, set the CMake variable
 # CPM_cuvs_SOURCE=/path/to/local/cuvs
 find_and_configure_cuvs(VERSION          ${CUML_MIN_VERSION_cuvs}
-      FORK             vyasr
-      PINNED_TAG       feat/raft_logger
+      FORK             rapidsai
+      PINNED_TAG       branch-${CUML_BRANCH_VERSION_cuvs}
       EXCLUDE_FROM_ALL ${CUML_EXCLUDE_CUVS_FROM_ALL}
       # When PINNED_TAG above doesn't match cuml,
       # force local cuvs clone in build directory
       # even if it's already installed.
-      CLONE_ON_PIN     OFF
+      CLONE_ON_PIN     ${CUML_CUVS_CLONE_ON_PIN}
       COMPILE_LIBRARY  ${CUML_CUVS_COMPILED}
       USE_CUVS_STATIC  ${CUML_USE_CUVS_STATIC}
       )
diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake
@@ -72,13 +72,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             vyasr
-      PINNED_TAG       feat/logger
+      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
       # even if it's already installed.
-      CLONE_ON_PIN     OFF
+      CLONE_ON_PIN     ${CUML_RAFT_CLONE_ON_PIN}
       COMPILE_LIBRARY  ${CUML_RAFT_COMPILED}
       USE_RAFT_STATIC  ${CUML_USE_RAFT_STATIC}
       NVTX             ${NVTX}