From cf69273b82e7800aaa574ff5c3789d70537f221e Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Wed, 22 Mar 2023 21:43:05 -0400 Subject: [PATCH] Using artifacts deployed from PR for now. Will update this with a follow-on --- ci/build_cpp.sh | 5 +++-- ci/build_python.sh | 8 +++++++- ci/test_cpp.sh | 2 ++ ci/test_python_common.sh | 7 ++++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 92a1522c9d..96d3125c4a 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. set -euo pipefail @@ -11,6 +11,7 @@ rapids-print-env rapids-logger "Begin cpp build" -rapids-mamba-retry mambabuild conda/recipes/libcuml +LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1365/a8a9bcd/raft_conda_cpp_cuda11_$(arch).tar.gz) +rapids-mamba-retry mambabuild --channel "${LIBRAFT_CHANNEL}" conda/recipes/libcuml rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index 26ae3d1d1f..9ccf93991f 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. set -euo pipefail @@ -12,12 +12,18 @@ rapids-print-env rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +PY_VER=${RAPIDS_PY_VERSION//./} +LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1365/a8a9bcd/raft_conda_cpp_cuda11_$(arch).tar.gz) +RAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1365/a8a9bcd/raft_conda_python_cuda11_${PY_VER}_$(arch).tar.gz) + # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly rapids-mamba-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ conda/recipes/cuml rapids-upload-conda-to-s3 python diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index c90bc590aa..108e34a232 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -19,6 +19,7 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1365/a8a9bcd/raft_conda_cpp_cuda11_$(arch).tar.gz) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" @@ -26,6 +27,7 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ libcuml libcuml-tests rapids-logger "Check GPU usage" diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 577532cbd7..8dd4b2315b 100644 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. set -euo pipefail @@ -21,6 +21,9 @@ 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/1365/a8a9bcd/raft_conda_cpp_cuda11_$(arch).tar.gz) +RAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1365/a8a9bcd/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 +34,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRAFT_CHANNEL}" \ + --channel "${RAFT_CHANNEL}" \ libcuml cuml rapids-logger "Check GPU usage"