diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 453bd39c0..d15182bcb 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="$(rapids-version)" + rapids-dependency-file-generator \ --output conda \ --file-key docs \ @@ -22,12 +24,11 @@ rapids-print-env rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -export RAPIDS_VERSION_NUMBER="24.12" export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - libwholegraph + "libwholegraph=${RAPIDS_VERSION}" rapids-logger "Build Doxygen docs" pushd cpp @@ -38,4 +39,4 @@ popd rapids-logger "Output temp dir: ${RAPIDS_DOCS_DIR}" -rapids-upload-docs +RAPIDS_VERSION_NUMBER="$(rapids-version-major-minor)" rapids-upload-docs diff --git a/ci/build_python.sh b/ci/build_python.sh index 1a3812b36..505cf8c94 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -13,8 +13,6 @@ export CMAKE_GENERATOR=Ninja rapids-print-env -PACKAGES="libwholegraph" - CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) rapids-generate-version > ./VERSION diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 3b66b2304..2b8b52ebd 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -81,4 +81,3 @@ for FILE in .github/workflows/*.yaml; do sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" done -sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 49f76376a..09ecf7a83 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="$(rapids-version)" + rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ @@ -27,11 +29,10 @@ mkdir -p "${RAPIDS_TESTS_DIR}" rapids-print-env -PACKAGES="libwholegraph libwholegraph-tests" - rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ - "${PACKAGES}" + "libwholegraph=${RAPIDS_VERSION}" \ + "libwholegraph-tests=${RAPIDS_VERSION}" rapids-logger "Check GPU usage" nvidia-smi diff --git a/ci/test_python.sh b/ci/test_python.sh index 80bc3513f..758a25dc7 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -8,6 +8,8 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ . /opt/conda/etc/profile.d/conda.sh +RAPIDS_VERSION="$(rapids-version)" + ARCH=$(arch) EXITCODE=0 @@ -44,13 +46,11 @@ mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}" rapids-print-env -PACKAGES="pylibwholegraph" - rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ 'mkl<2024.1.0' \ - "${PACKAGES}" + "pylibwholegraph=${RAPIDS_VERSION}" rapids-logger "Check GPU usage" nvidia-smi