From 686a0db792d994d5f66b47e94c13773da0a510ad Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 8 Oct 2024 08:16:43 -0500 Subject: [PATCH 1/4] make conda installs in CI stricter --- ci/build_docs.sh | 5 ++++- ci/test_cpp.sh | 5 ++++- ci/test_python.sh | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 970417c1d..a65382846 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -6,6 +6,8 @@ set -euo pipefail rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" + rapids-dependency-file-generator \ --output conda \ --file-key docs \ @@ -23,7 +25,8 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ - rmm librmm + "rmm=${RAPIDS_VERSION_MAJOR_MINOR}" \ + "librmm=${RAPIDS_VERSION_MAJOR_MINOR}" export RAPIDS_VERSION="$(rapids-version)" export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 9ad1c9536..02435f249 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -8,6 +8,8 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ . /opt/conda/etc/profile.d/conda.sh +RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" + rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ @@ -29,7 +31,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - librmm librmm-tests + "librmm=${RAPIDS_VERSION_MAJOR_MINOR}" \ + "librmm-tests=${RAPIDS_VERSION_MAJOR_MINOR}" rapids-logger "Check GPU usage" nvidia-smi diff --git a/ci/test_python.sh b/ci/test_python.sh index 386d0b063..e905d2019 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -28,7 +28,8 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ - rmm librmm + "rmm=${RAPIDS_VERSION_MAJOR_MINOR}" \ + "librmm=${RAPIDS_VERSION_MAJOR_MINOR}" RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"} From 9554e7e3582dd2947f154e9dee6d3763e49462e4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 8 Oct 2024 08:19:26 -0500 Subject: [PATCH 2/4] one more RAPIDS_VERSION_MAJOR_MINOR --- ci/test_python.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/test_python.sh b/ci/test_python.sh index e905d2019..7a688107e 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -9,6 +9,8 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" + rapids-dependency-file-generator \ --output conda \ --file-key test_python \ From f81432d14da38d6592390e9a7ea8a62c41638460 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 8 Oct 2024 08:30:15 -0500 Subject: [PATCH 3/4] re-arrange --- ci/build_docs.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index a65382846..78d034b84 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -6,7 +6,10 @@ set -euo pipefail rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" +export RAPIDS_VERSION="$(rapids-version)" +export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" +export RAPIDS_VERSION_NUMBER="$RAPIDS_VERSION_MAJOR_MINOR" +export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-dependency-file-generator \ --output conda \ @@ -28,11 +31,6 @@ rapids-mamba-retry install \ "rmm=${RAPIDS_VERSION_MAJOR_MINOR}" \ "librmm=${RAPIDS_VERSION_MAJOR_MINOR}" -export RAPIDS_VERSION="$(rapids-version)" -export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" -export RAPIDS_VERSION_NUMBER="$RAPIDS_VERSION_MAJOR_MINOR" -export RAPIDS_DOCS_DIR="$(mktemp -d)" - rapids-logger "Build CPP docs" pushd doxygen doxygen Doxyfile From b8d112ec8c3600ffd0d3af3a166ce65d657d3937 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 8 Oct 2024 14:10:40 -0500 Subject: [PATCH 4/4] match env variables with cudf conventions --- ci/build_docs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 78d034b84..fadaf0f27 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -6,10 +6,8 @@ set -euo pipefail rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh -export RAPIDS_VERSION="$(rapids-version)" -export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" +RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" export RAPIDS_VERSION_NUMBER="$RAPIDS_VERSION_MAJOR_MINOR" -export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-dependency-file-generator \ --output conda \ @@ -31,6 +29,8 @@ rapids-mamba-retry install \ "rmm=${RAPIDS_VERSION_MAJOR_MINOR}" \ "librmm=${RAPIDS_VERSION_MAJOR_MINOR}" +export RAPIDS_DOCS_DIR="$(mktemp -d)" + rapids-logger "Build CPP docs" pushd doxygen doxygen Doxyfile