diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 3fd57f24c40..47489c95416 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -11,6 +11,10 @@ rapids-print-env rapids-logger "Begin cpp build" -rapids-mamba-retry mambabuild conda/recipes/libcugraph +LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz) + +rapids-mamba-retry mambabuild \ + --channel "${LIBRAFT_CHANNEL}" \ + conda/recipes/libcugraph rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 517dda726ee..a69fbcef336 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -10,6 +10,10 @@ export CMAKE_GENERATOR=Ninja rapids-print-env CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +PY_VER=${RAPIDS_PY_VERSION//./} + +LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz) +RAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_python_cuda11_${PY_VER}_$(arch).tar.gz) rapids-logger "Begin py build" @@ -17,24 +21,32 @@ rapids-logger "Begin py build" # node works correctly rapids-mamba-retry mambabuild \ --no-test \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ --channel "${CPP_CHANNEL}" \ conda/recipes/pylibcugraph rapids-mamba-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cugraph rapids-mamba-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cugraph-service rapids-mamba-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ --channel pyg \ --channel pytorch \ @@ -44,6 +56,8 @@ rapids-mamba-retry mambabuild \ rapids-mamba-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ --channel dglteam \ --channel pytorch \ diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index a6c4cdb4a4f..cc94955034a 100755 --- 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) +LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz) + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" @@ -26,6 +28,7 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ libcugraph libcugraph_etl libcugraph-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python.sh b/ci/test_python.sh index f1ddf08df97..2b9aa8c0f5c 100755 --- 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) +PY_VER=${RAPIDS_PY_VERSION//./} + +LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_cpp_cuda11_$(arch).tar.gz) +RAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1469/6d8ec7b/raft_conda_python_cuda11_${PY_VER}_$(arch).tar.gz) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} @@ -31,6 +35,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ libcugraph \ pylibcugraph \ cugraph \ @@ -115,6 +121,8 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ --channel pytorch \ --channel pytorch-nightly \ --channel dglteam/label/cu118 \ @@ -177,6 +185,8 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ libcugraph \ pylibcugraph \ cugraph \