diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f4bb9b1ca2..d42a012ef5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -286,6 +286,7 @@ jobs: date: ${{ inputs.date }} package-name: libcuvs package-type: cpp + publish-wheel-search-key: cuvs_wheel_cpp_libcuvs wheel-build-cuvs: needs: wheel-build-libcuvs permissions: @@ -326,7 +327,7 @@ jobs: date: ${{ inputs.date }} package-name: cuvs package-type: python - publish-wheel-search-key: cuvs_wheel_python_abi3 + publish-wheel-search-key: cuvs_wheel_python_cuvs devcontainers: name: Build devcontainers secrets: inherit # zizmor: ignore[secrets-inherit] diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 92eabc9ff8..356c43aa30 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -394,6 +394,7 @@ jobs: with: build_type: pull-request symbol_exclusions: (void (thrust::|cub::)) + package_name: libcuvs conda-python-build: needs: conda-cpp-build permissions: diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index b4195323ba..bb497692bd 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 @@ -37,3 +37,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 libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")" +export RAPIDS_PACKAGE_NAME diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 65c8f29f8a..983236c3a3 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" cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuvs cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/build_go.sh b/ci/build_go.sh index 80370048ff..056f40b345 100755 --- a/ci/build_go.sh +++ b/ci/build_go.sh @@ -5,7 +5,7 @@ set -euo pipefail 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 libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/build_java.sh b/ci/build_java.sh index daf814884d..2e363bb452 100755 --- a/ci/build_java.sh +++ b/ci/build_java.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION. +# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION. # SPDX-License-Identifier: Apache-2.0 set -euo pipefail @@ -26,7 +26,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 libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Generate Java testing dependencies" diff --git a/ci/build_python.sh b/ci/build_python.sh index c153bdd948..6823cbbec5 100755 --- 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 libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") version=$(rapids-generate-version) export RAPIDS_PACKAGE_VERSION=${version} @@ -59,5 +59,5 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "13" ]]; then sccache --stop-server >/dev/null 2>&1 || true fi -RAPIDS_PACKAGE_NAME="$(rapids-package-name conda_python cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")" +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name conda_python cuvs cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")" export RAPIDS_PACKAGE_NAME diff --git a/ci/build_rust.sh b/ci/build_rust.sh index 5e68949ee8..e9218a8adc 100755 --- a/ci/build_rust.sh +++ b/ci/build_rust.sh @@ -5,7 +5,7 @@ set -euo pipefail 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 libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh diff --git a/ci/build_wheel_cuvs.sh b/ci/build_wheel_cuvs.sh index 75be8a6dff..2acbab8a2d 100755 --- a/ci/build_wheel_cuvs.sh +++ b/ci/build_wheel_cuvs.sh @@ -15,7 +15,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) -LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) +LIBCUVS_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") echo "libcuvs-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBCUVS_WHEELHOUSE}"/libcuvs_*.whl)" >> "${PIP_CONSTRAINT}" # TODO: move this variable into `ci-wheel` @@ -26,5 +26,5 @@ export RAPIDS_PY_API ci/build_wheel.sh cuvs ${package_dir} --stable ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" -RAPIDS_PACKAGE_NAME="$(rapids-package-name wheel_python cuvs --stable --cuda)" +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_python cuvs cuvs --stable --cuda)" export RAPIDS_PACKAGE_NAME diff --git a/ci/build_wheel_libcuvs.sh b/ci/build_wheel_libcuvs.sh index 6eb6bfa5ab..e012935749 100755 --- a/ci/build_wheel_libcuvs.sh +++ b/ci/build_wheel_libcuvs.sh @@ -31,3 +31,6 @@ export PIP_NO_BUILD_ISOLATION=0 ci/build_wheel.sh libcuvs ${package_dir} ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" + +RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")" +export RAPIDS_PACKAGE_NAME diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 5b7a393f31..0905cd64f0 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -9,7 +9,7 @@ set -euo pipefail rapids-logger "Configuring conda strict channel priority" conda config --set channel_priority strict -CPP_CHANNEL=$(rapids-download-conda-from-github cpp) +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ diff --git a/ci/test_python.sh b/ci/test_python.sh index ebb6ab2762..77840ac28d 100755 --- a/ci/test_python.sh +++ b/ci/test_python.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" cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")") +CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") +PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python cuvs cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")") rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ diff --git a/ci/test_wheel_cuvs.sh b/ci/test_wheel_cuvs.sh index c0758da20b..36fefdf852 100755 --- a/ci/test_wheel_cuvs.sh +++ b/ci/test_wheel_cuvs.sh @@ -9,9 +9,8 @@ source rapids-init-pip # Delete system libnccl.so to ensure the wheel is used rm -rf /usr/lib64/libnccl* -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) -CUVS_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")") +LIBCUVS_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")") +CUVS_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_python cuvs cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")") # generate constraints (possibly pinning to oldest support versions of dependencies) rapids-generate-pip-constraints test_python "${PIP_CONSTRAINT}"