Fix scripts

rapidsai · Nov 16, 2023 · 867a1a1 · 867a1a1
1 parent b237099
commit 867a1a1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -19,7 +19,8 @@ rapids-logger "Begin cpp build"
 
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
   --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
+  --channel "${LIBCUDF_CHANNEL}" \
+  --channel "${LIBRAFT_CHANNEL}" \
   conda/recipes/libcugraph
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -21,8 +21,11 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -12,7 +12,9 @@ rapids-print-env
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
 RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 

diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -32,11 +32,8 @@ rapids-print-env
 rapids-mamba-retry install \
     --channel "${CPP_CHANNEL}" \
     --channel "${LIBRMM_CHANNEL}" \
-    --channel "${RMM_CHANNEL}" \
     --channel "${LIBCUDF_CHANNEL}" \
-    --channel "${CUDF_CHANNEL}" \
     --channel "${LIBRAFT_CHANNEL}" \
-    --channel "${RAFT_CHANNEL}" \
     libcugraph libcugraph_etl libcugraph-tests
 
 rapids-logger "Check GPU usage"

diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh
@@ -25,8 +25,11 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -23,8 +23,11 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
 RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}