Use upstream artifacts.

rapidsai · Dec 16, 2023 · 565984a · 565984a
1 parent cfa23cf
commit 565984a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -9,11 +9,16 @@ export CMAKE_GENERATOR=Ninja
 
 rapids-print-env
 
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
+LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
+
 version=$(rapids-generate-version)
 
 rapids-logger "Begin cpp build"
 
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
+    --channel "${LIBRMM_CHANNEL}" \
+    --channel "${LIBCUDF_CHANNEL}" \
     conda/recipes/libcuspatial
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -15,11 +15,15 @@ version=$(rapids-generate-version)
 commit=$(git rev-parse HEAD)
 
 echo "${version}" > VERSION
-for package_name in cuspatial cuproj; do 
+for package_name in cuspatial cuproj; do
     sed -i "/^__git_commit__/ s/= .*/= \"${commit}\"/g" "${package_dir}/${package_name}/${package_name}/_version.py"
 done
 
 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)
+LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 python)
 
 rapids-logger "Begin py build cuSpatial"
 
@@ -28,6 +32,10 @@ rapids-logger "Begin py build cuSpatial"
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
+  --channel "${LIBCUDF_CHANNEL}" \
+  --channel "${CUDF_CHANNEL}" \
   conda/recipes/cuspatial
 
 rapids-logger "Begin py build cuProj"
@@ -37,6 +45,10 @@ rapids-logger "Begin py build cuProj"
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
+  --channel "${LIBCUDF_CHANNEL}" \
+  --channel "${CUDF_CHANNEL}" \
   conda/recipes/cuproj
 
 rapids-upload-conda-to-s3 python
diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -19,6 +19,8 @@ conda activate test
 set -u
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
+LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"
 
@@ -29,6 +31,8 @@ rapids-print-env
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${LIBCUDF_CHANNEL}" \
   libcuspatial libcuspatial-tests
 
 rapids-logger "Check GPU usage"

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -21,6 +21,10 @@ 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)
+LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 python)
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
 RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
@@ -34,6 +38,10 @@ rapids-print-env
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${RMM_CHANNEL}" \
+  --channel "${LIBCUDF_CHANNEL}" \
+  --channel "${CUDF_CHANNEL}" \
   libcuspatial cuspatial cuproj
 
 rapids-logger "Check GPU usage"