From 4706ce16d6c39d679e5a37a710d51f28420b0e2a Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Thu, 9 Nov 2023 02:13:25 +0000 Subject: [PATCH] Use artifacts from rapidsai/rmm#1095 in CI --- ci/build_cpp.sh | 7 +++++++ ci/build_python.sh | 12 ++++++++++++ ci/test_cpp.sh | 11 +++++++++++ ci/test_notebooks.sh | 11 +++++++++++ ci/test_python.sh | 10 ++++++++++ 5 files changed, 51 insertions(+) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 007eb17ee..b290e0ffb 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -7,11 +7,18 @@ source rapids-env-update export CMAKE_GENERATOR=Ninja +REPO="rmm" +PR_NUMBER="1095" +COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) +RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" +LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) + rapids-print-env rapids-logger "Begin cpp build" rapids-conda-retry mambabuild \ + --channel "${LIBRMM_CHANNEL}" \ conda/recipes/libcuspatial rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index de5c3fef8..35914f890 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -11,6 +11,14 @@ rapids-print-env CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +REPO="rmm" +PR_NUMBER="1095" +COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) +RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" +PYTHON_MINOR_VERSION=$(python --version | sed -E 's/Python [0-9]+\.([0-9]+)\.[0-9]+/\1/g') +LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) +RMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_python_cuda${RAPIDS_CUDA_MAJOR}_3${PYTHON_MINOR_VERSION}_$(arch).tar.gz) + rapids-logger "Begin py build cuSpatial" # TODO: Remove `--no-test` flag once importing on a CPU @@ -18,6 +26,8 @@ rapids-logger "Begin py build cuSpatial" rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ conda/recipes/cuspatial rapids-logger "Begin py build cuProj" @@ -27,6 +37,8 @@ rapids-logger "Begin py build cuProj" rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ conda/recipes/cuproj rapids-upload-conda-to-s3 python diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 859820420..7f48f4778 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -19,6 +19,15 @@ conda activate test set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) + +REPO="rmm" +PR_NUMBER="1095" +COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) +RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" +PYTHON_MINOR_VERSION=$(python --version | sed -E 's/Python [0-9]+\.([0-9]+)\.[0-9]+/\1/g') +LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) +RMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_python_cuda${RAPIDS_CUDA_MAJOR}_3${PYTHON_MINOR_VERSION}_$(arch).tar.gz) + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" @@ -29,6 +38,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libcuspatial libcuspatial-tests rapids-logger "Check GPU usage" diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 457650d78..f7edcebb6 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -24,9 +24,20 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +REPO="rmm" +PR_NUMBER="1095" +COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) +RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" +PYTHON_MINOR_VERSION=$(python --version | sed -E 's/Python [0-9]+\.([0-9]+)\.[0-9]+/\1/g') +LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) +RMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_python_cuda${RAPIDS_CUDA_MAJOR}_3${PYTHON_MINOR_VERSION}_$(arch).tar.gz) + + rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ cuspatial libcuspatial cuproj NBTEST="$(realpath "$(dirname "$0")/utils/nbtest.sh")" diff --git a/ci/test_python.sh b/ci/test_python.sh index 912b2c520..7a0e9c38d 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -22,6 +22,14 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +REPO="rmm" +PR_NUMBER="1095" +COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) +RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" +PYTHON_MINOR_VERSION=$(python --version | sed -E 's/Python [0-9]+\.([0-9]+)\.[0-9]+/\1/g') +LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) +RMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_python_cuda${RAPIDS_CUDA_MAJOR}_3${PYTHON_MINOR_VERSION}_$(arch).tar.gz) + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}" @@ -34,6 +42,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ + --channel "${LIBRMM_CHANNEL}" \ + --channel "${RMM_CHANNEL}" \ libcuspatial cuspatial cuproj rapids-logger "Check GPU usage"