From eb2e16757e8459e0a7d02d4c79fe451341e4e783 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Wed, 29 Apr 2026 10:50:03 -0400 Subject: [PATCH] refactor: switch to rapids-artifact-name for consistent artifact naming --- ci/build_cpp.sh | 3 +++ ci/build_docs.sh | 4 ++-- ci/build_python.sh | 4 ++-- ci/build_wheel_distributed_ucxx.sh | 2 +- ci/build_wheel_libucxx.sh | 3 +++ ci/build_wheel_ucxx.sh | 4 ++-- ci/test_cpp.sh | 4 ++-- ci/test_python.sh | 4 ++-- ci/test_python_distributed.sh | 4 ++-- ci/test_wheel_distributed_ucxx.sh | 12 ++++++------ ci/test_wheel_ucxx.sh | 8 ++++---- 11 files changed, 29 insertions(+), 23 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index ded7cc45f..13b0edd9c 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -36,3 +36,6 @@ sccache --stop-server >/dev/null 2>&1 || true # remove build_cache directory rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache + +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name conda_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")" +export RAPIDS_PACKAGE_NAME diff --git a/ci/build_docs.sh b/ci/build_docs.sh index fcf5b7ee6..10e555a47 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -5,8 +5,8 @@ set -euo pipefail rapids-logger "Downloading artifacts from previous jobs" -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) -PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-package-name "conda_python" ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python ucxx ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/build_python.sh b/ci/build_python.sh index 3eb2117a6..296a02bc4 100644 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -13,7 +13,7 @@ rapids-print-env rapids-logger "Begin py build" -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") sccache --stop-server 2>/dev/null || true @@ -45,5 +45,5 @@ sccache --stop-server >/dev/null 2>&1 || true # See https://github.com/prefix-dev/rattler-build/issues/1424 rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache -RAPIDS_PACKAGE_NAME="$(rapids-package-name conda_python ucxx --stable --cuda)" +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name conda_python ucxx ucxx --stable --cuda)" export RAPIDS_PACKAGE_NAME diff --git a/ci/build_wheel_distributed_ucxx.sh b/ci/build_wheel_distributed_ucxx.sh index 664406229..cb144823d 100755 --- a/ci/build_wheel_distributed_ucxx.sh +++ b/ci/build_wheel_distributed_ucxx.sh @@ -12,5 +12,5 @@ package_dir="python/distributed-ucxx" cp "${package_dir}/dist"/* "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}/" ./ci/validate_wheel.sh "${package_dir}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" -RAPIDS_PACKAGE_NAME="$(rapids-package-name wheel_python distributed-ucxx --pure --cuda "${RAPIDS_CUDA_VERSION}")" +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_python distributed-ucxx ucxx --pure --cuda "${RAPIDS_CUDA_VERSION}")" export RAPIDS_PACKAGE_NAME diff --git a/ci/build_wheel_libucxx.sh b/ci/build_wheel_libucxx.sh index 15d458c4e..a98b2cac2 100755 --- a/ci/build_wheel_libucxx.sh +++ b/ci/build_wheel_libucxx.sh @@ -40,3 +40,6 @@ python -m auditwheel repair \ ${package_dir}/dist/* ./ci/validate_wheel.sh "${package_dir}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" + +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_cpp libucxx ucxx --cuda "${RAPIDS_CUDA_VERSION}")" +export RAPIDS_PACKAGE_NAME diff --git a/ci/build_wheel_ucxx.sh b/ci/build_wheel_ucxx.sh index 9ac98453b..b9b1fb8f6 100755 --- a/ci/build_wheel_ucxx.sh +++ b/ci/build_wheel_ucxx.sh @@ -16,7 +16,7 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" # # env variable 'PIP_CONSTRAINT' is set up by rapids-init-pip. It constrains all subsequent # 'pip install', 'pip download', etc. calls (except those used in 'pip wheel', handled separately in build scripts) -LIBUCXX_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libucxx_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +LIBUCXX_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") echo "libucxx-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBUCXX_WHEELHOUSE}"/libucxx_*.whl)" >> "${PIP_CONSTRAINT}" export SKBUILD_CMAKE_ARGS="-DFIND_UCXX_CPP=ON;-DCMAKE_INSTALL_LIBDIR=ucxx/lib64;-DCMAKE_INSTALL_INCLUDEDIR=ucxx/include" @@ -38,5 +38,5 @@ python -m auditwheel repair \ ./ci/validate_wheel.sh "${package_dir}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" -RAPIDS_PACKAGE_NAME="$(rapids-package-name wheel_python ucxx --stable --cuda)" +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_python ucxx ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")" export RAPIDS_PACKAGE_NAME diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 52baa9a71..740a60c70 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. +# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. # SPDX-License-Identifier: BSD-3-Clause set -euo pipefail @@ -8,7 +8,7 @@ set -euo pipefail source "$(dirname "$0")/test_common.sh" rapids-logger "Downloading artifacts from previous jobs" -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/test_python.sh b/ci/test_python.sh index 71d15d94b..15c94142e 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -8,8 +8,8 @@ set -euo pipefail source "$(dirname "$0")/test_common.sh" rapids-logger "Downloading artifacts from previous jobs" -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) -PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-package-name "conda_python" ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python ucxx ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/test_python_distributed.sh b/ci/test_python_distributed.sh index f58287c9f..c0bf81910 100755 --- a/ci/test_python_distributed.sh +++ b/ci/test_python_distributed.sh @@ -8,8 +8,8 @@ set -euo pipefail source "$(dirname "$0")/test_common.sh" rapids-logger "Downloading artifacts from previous jobs" -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) -PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-package-name "conda_python" ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python ucxx ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/test_wheel_distributed_ucxx.sh b/ci/test_wheel_distributed_ucxx.sh index a0f10a3c7..3ff4730e0 100755 --- a/ci/test_wheel_distributed_ucxx.sh +++ b/ci/test_wheel_distributed_ucxx.sh @@ -12,9 +12,9 @@ source "$(dirname "$0")/test_common.sh" RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -distributed_ucxx_wheelhouse=$(rapids-download-from-github "$(rapids-package-name wheel_python distributed-ucxx --pure --cuda "${RAPIDS_CUDA_VERSION}")") -ucxx_wheelhouse=$(rapids-download-from-github "$(rapids-package-name "wheel_python" ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") -libucxx_wheelhouse=$(RAPIDS_PY_WHEEL_NAME="libucxx_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +LIBUCXX_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") +UCXX_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python ucxx ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") +DISTRIBUTED_UCXX_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python distributed-ucxx ucxx --pure --cuda "$RAPIDS_CUDA_VERSION")") # generate constraints (possibly pinning to oldest support versions of dependencies) rapids-generate-pip-constraints test_python "${PIP_CONSTRAINT}" @@ -29,9 +29,9 @@ rapids-pip-retry install \ -v \ --prefer-binary \ --constraint "${PIP_CONSTRAINT}" \ - "${libucxx_wheelhouse}/libucxx_${RAPIDS_PY_CUDA_SUFFIX}"*.whl \ - "${ucxx_wheelhouse}/ucxx_${RAPIDS_PY_CUDA_SUFFIX}"*.whl \ - "$(echo "${distributed_ucxx_wheelhouse}"/"${package_name}_${RAPIDS_PY_CUDA_SUFFIX}"*.whl)[test]" + "${LIBUCXX_WHEELHOUSE}/libucxx_${RAPIDS_PY_CUDA_SUFFIX}"*.whl \ + "${UCXX_WHEELHOUSE}/ucxx_${RAPIDS_PY_CUDA_SUFFIX}"*.whl \ + "$(echo "${DISTRIBUTED_UCXX_WHEELHOUSE}"/"${package_name}_${RAPIDS_PY_CUDA_SUFFIX}"*.whl)[test]" print_system_stats diff --git a/ci/test_wheel_ucxx.sh b/ci/test_wheel_ucxx.sh index cf85bc212..abd9b3225 100755 --- a/ci/test_wheel_ucxx.sh +++ b/ci/test_wheel_ucxx.sh @@ -14,8 +14,8 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" # Download the packages built in the previous step RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -libucxx_wheelhouse=$(RAPIDS_PY_WHEEL_NAME="libucxx_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) -ucxx_wheelhouse=$(rapids-download-from-github "$(rapids-package-name "wheel_python" ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") +LIBUCXX_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libucxx ucxx --cuda "$RAPIDS_CUDA_VERSION")") +UCXX_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python ucxx ucxx --stable --cuda "$RAPIDS_CUDA_VERSION")") # generate constraints (possibly pinning to oldest support versions of dependencies) rapids-generate-pip-constraints test_python "${PIP_CONSTRAINT}" @@ -30,8 +30,8 @@ rapids-pip-retry install \ -v \ --prefer-binary \ --constraint "${PIP_CONSTRAINT}" \ - "${libucxx_wheelhouse}/libucxx_${RAPIDS_PY_CUDA_SUFFIX}"*.whl \ - "$(echo "${ucxx_wheelhouse}"/"${package_name}_${RAPIDS_PY_CUDA_SUFFIX}"*.whl)[test]" + "${LIBUCXX_WHEELHOUSE}/libucxx_${RAPIDS_PY_CUDA_SUFFIX}"*.whl \ + "$(echo "${UCXX_WHEELHOUSE}"/"${package_name}_${RAPIDS_PY_CUDA_SUFFIX}"*.whl)[test]" print_system_stats