Use upstream artifacts.

rapidsai · Dec 16, 2023 · 66e28a6 · 66e28a6
1 parent 18ec49e
commit 66e28a6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -9,10 +9,18 @@ export CMAKE_GENERATOR=Ninja
 
 rapids-print-env
 
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
+LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg xxx cpp)
+
 version=$(rapids-generate-version)
 
 rapids-logger "Begin cpp build"
 
-RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libcuml
+RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
+    --channel "${LIBRMM_CHANNEL}" \
+    --channel "${LIBRAFT_CHANNEL}" \
+    --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \
+    conda/recipes/libcuml
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -14,20 +14,30 @@ package_dir="python"
 
 version=$(rapids-generate-version)
 git_commit=$(git rev-parse HEAD)
-export RAPIDS_PACKAGE_VERSION=${version} 
+export RAPIDS_PACKAGE_VERSION=${version}
 
 echo "${version}" > VERSION
 sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${package_name}/_version.py"
 
 rapids-logger "Begin py build"
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 python)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 python)
+LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg xxx cpp)
 
 # TODO: Remove `--no-test` flag once importing on a CPU
 # node works correctly
 rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
+  --channel "${LIBRAFT_CHANNEL}" \
+  --channel "${RAFT_CHANNEL}" \
+  --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \
   conda/recipes/cuml
 
 # Build cuml-cpu only in CUDA 11 jobs since it only depends on python

diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -19,13 +19,19 @@ conda activate test
 set -u
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
+LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg xxx cpp)
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"
 
 rapids-print-env
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${LIBRAFT_CHANNEL}" \
+  --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \
   libcuml libcuml-tests
 
 rapids-logger "Check GPU usage"

diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh
@@ -21,6 +21,11 @@ set -u
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 python)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 python)
+LIBCUMLPRIMS_MG_CHANNEL=$(rapids-get-pr-conda-artifact cumlprims_mg xxx cpp)
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
 RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
@@ -31,6 +36,11 @@ rapids-print-env
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
+  --channel "${LIBRAFT_CHANNEL}" \
+  --channel "${RAFT_CHANNEL}" \
+  --channel "${LIBCUMLPRIMS_MG_CHANNEL}" \
   libcuml cuml
 
 rapids-logger "Check GPU usage"