From e6889dc57376257085ee2199c2902fe8b38c021c Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Wed, 27 May 2026 14:33:05 -0400 Subject: [PATCH 1/3] refactor: switch to `rapids-artifact-name` for consistent artifact naming --- .github/workflows/pr.yaml | 1 + ci/build_cpp.sh | 5 ++++- ci/build_docs.sh | 5 +++-- ci/build_python.sh | 4 ++-- ci/build_wheel_cuml.sh | 4 ++-- ci/build_wheel_libcuml.sh | 3 +++ ci/test_cpp.sh | 2 +- ci/test_notebooks.sh | 4 ++-- ci/test_python_common.sh | 4 ++-- ci/test_wheel.sh | 6 +++--- ci/test_wheel_dask.sh | 5 ++--- ci/test_wheel_integrations.sh | 5 ++--- 12 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 26ab17f874..407736f963 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -329,6 +329,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@main with: build_type: pull-request + package_name: libcuml conda-python-build: needs: conda-cpp-build permissions: diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index b6c21ba29e..d7af96b636 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION. +# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION. # SPDX-License-Identifier: Apache-2.0 set -euo pipefail @@ -34,3 +34,6 @@ sccache --stop-server >/dev/null 2>&1 || true # remove build_cache directory to avoid uploading the entire source tree # tracked in https://github.com/prefix-dev/rattler-build/issues/1424 rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache + +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name conda_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")" +export RAPIDS_PACKAGE_NAME diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 110e94d6fd..2404d96dc1 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -4,8 +4,9 @@ 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" cuml --stable --cuda "${RAPIDS_CUDA_VERSION}")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuml cuml --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 ffa3264b7f..62c7947189 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -15,7 +15,7 @@ rapids-generate-version > ./VERSION rapids-logger "Begin py build" -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) export RAPIDS_PACKAGE_VERSION @@ -45,5 +45,5 @@ sccache --stop-server >/dev/null 2>&1 || true # tracked in 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 cuml --stable --cuda)" +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name conda_python cuml cuml --stable --cuda "$RAPIDS_CUDA_VERSION")" export RAPIDS_PACKAGE_NAME diff --git a/ci/build_wheel_cuml.sh b/ci/build_wheel_cuml.sh index d1f34c4c4c..0178d3d421 100755 --- a/ci/build_wheel_cuml.sh +++ b/ci/build_wheel_cuml.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)C -LIBCUML_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuml_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +LIBCUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") echo "libcuml-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBCUML_WHEELHOUSE}"/libcuml_*.whl)" >> "${PIP_CONSTRAINT}" EXCLUDE_ARGS=( @@ -51,5 +51,5 @@ python -m auditwheel repair \ ./ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" -RAPIDS_PACKAGE_NAME="$(rapids-package-name wheel_python cuml --stable --cuda)" +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_python cuml cuml --stable --cuda "$RAPIDS_CUDA_VERSION")" export RAPIDS_PACKAGE_NAME diff --git a/ci/build_wheel_libcuml.sh b/ci/build_wheel_libcuml.sh index 2a31b40cca..302c8c5338 100755 --- a/ci/build_wheel_libcuml.sh +++ b/ci/build_wheel_libcuml.sh @@ -53,3 +53,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 libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")" +export RAPIDS_PACKAGE_NAME diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index d7c7c011d5..e31178f75b 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -13,7 +13,7 @@ rapids-logger "Configuring conda strict channel priority" conda config --set channel_priority strict 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 libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 167874ff0f..825f6ec473 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -9,8 +9,8 @@ rapids-logger "Configuring conda strict channel priority" conda config --set channel_priority strict 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" cuml --stable --cuda "${RAPIDS_CUDA_VERSION}")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuml cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Generate Notebook testing dependencies" rapids-dependency-file-generator \ diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index f9988eb199..fa754c73b3 100644 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -10,8 +10,8 @@ rapids-logger "Configuring conda strict channel priority" conda config --set channel_priority strict 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" cuml --stable --cuda "${RAPIDS_CUDA_VERSION}")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuml cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index 780141f1c6..13d6882802 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -6,9 +6,9 @@ set -euo pipefail source rapids-init-pip -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -CUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") -LIBCUML_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuml_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +LIBCUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") +CUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuml cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") + RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} mkdir -p "${RAPIDS_TESTS_DIR}" diff --git a/ci/test_wheel_dask.sh b/ci/test_wheel_dask.sh index 46ecbb5788..c91b1d5ee5 100755 --- a/ci/test_wheel_dask.sh +++ b/ci/test_wheel_dask.sh @@ -6,9 +6,8 @@ set -euo pipefail source rapids-init-pip -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -CUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") -LIBCUML_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuml_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +LIBCUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") +CUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuml cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} mkdir -p "${RAPIDS_TESTS_DIR}" diff --git a/ci/test_wheel_integrations.sh b/ci/test_wheel_integrations.sh index 4cae43456a..03840aae63 100755 --- a/ci/test_wheel_integrations.sh +++ b/ci/test_wheel_integrations.sh @@ -6,9 +6,8 @@ set -euo pipefail source rapids-init-pip -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -CUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") -LIBCUML_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuml_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +LIBCUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuml cuml --cuda "$RAPIDS_CUDA_VERSION")") +CUML_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuml cuml --stable --cuda "$RAPIDS_CUDA_VERSION")") RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} mkdir -p "${RAPIDS_TESTS_DIR}" From b88ea9ed8399f3369e535c4e7600d7cccc5a2297 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Thu, 28 May 2026 12:51:54 -0400 Subject: [PATCH 2/3] fix: update wheel publish key --- .github/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e5fa0a2076..f9b6580288 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -141,6 +141,7 @@ jobs: date: ${{ inputs.date }} package-name: libcuml package-type: cpp + publish-wheel-search-key: cuml_wheel_cpp_libcuml wheel-build-cuml: needs: wheel-build-libcuml permissions: @@ -179,7 +180,7 @@ jobs: date: ${{ inputs.date }} package-name: cuml package-type: python - publish-wheel-search-key: cuml_wheel_python_abi3 + publish-wheel-search-key: cuml_wheel_python_cuml devcontainers: name: Build devcontainers secrets: inherit # zizmor: ignore[secrets-inherit] From 38edee5c2aaadcf74b8246e7f094861b8e46dd67 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Mon, 8 Jun 2026 13:24:03 -0400 Subject: [PATCH 3/3] fix(test.yaml): add package_name to conda-cpp-checks --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3653e51000..6705aee34d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -39,6 +39,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + package_name: libcuml conda-cpp-tests: permissions: actions: read