Skip to content

Commit 9118410

Browse files
authored
Merge branch 'main' into landrumb/cagra-degree-warning
2 parents dfdeced + 78135be commit 9118410

49 files changed

Lines changed: 1996 additions & 357 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ jobs:
285285
date: ${{ inputs.date }}
286286
package-name: libcuvs
287287
package-type: cpp
288+
publish-wheel-search-key: cuvs_wheel_cpp_libcuvs
288289
wheel-build-cuvs:
289290
needs: wheel-build-libcuvs
290291
permissions:
@@ -325,7 +326,7 @@ jobs:
325326
date: ${{ inputs.date }}
326327
package-name: cuvs
327328
package-type: python
328-
publish-wheel-search-key: cuvs_wheel_python_abi3
329+
publish-wheel-search-key: cuvs_wheel_python_cuvs
329330
devcontainers:
330331
name: Build devcontainers
331332
secrets: inherit # zizmor: ignore[secrets-inherit]

.github/workflows/pr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ jobs:
406406
with:
407407
build_type: pull-request
408408
symbol_exclusions: (void (thrust::|cub::))
409+
package_name: libcuvs
409410
conda-python-build:
410411
needs: conda-cpp-build
411412
permissions:

.github/workflows/test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
date: ${{ inputs.date }}
4040
sha: ${{ inputs.sha }}
4141
symbol_exclusions: (void (thrust::|cub::))
42+
package_name: libcuvs
4243
conda-cpp-tests:
4344
permissions:
4445
actions: read

ci/build_cpp.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION.
33
# SPDX-License-Identifier: Apache-2.0
44

55
set -euo pipefail
@@ -37,3 +37,6 @@ sccache --stop-server >/dev/null 2>&1 || true
3737

3838
# remove build_cache directory
3939
rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache
40+
41+
RAPIDS_PACKAGE_NAME="$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")"
42+
export RAPIDS_PACKAGE_NAME

ci/build_go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set -euo pipefail
66

77
rapids-logger "Downloading artifacts from previous jobs"
8-
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
8+
CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")")
99

1010
rapids-logger "Create test conda environment"
1111
. /opt/conda/etc/profile.d/conda.sh

ci/build_java.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
33
# SPDX-License-Identifier: Apache-2.0
44

55
set -euo pipefail
@@ -26,7 +26,7 @@ rapids-logger "Configuring conda strict channel priority"
2626
conda config --set channel_priority strict
2727

2828
rapids-logger "Downloading artifacts from previous jobs"
29-
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
29+
CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")")
3030

3131
rapids-logger "Generate Java testing dependencies"
3232

ci/build_python.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rapids-print-env
1313

1414
rapids-logger "Begin py build"
1515

16-
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
16+
CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")")
1717

1818
version=$(rapids-generate-version)
1919
export RAPIDS_PACKAGE_VERSION=${version}
@@ -59,5 +59,5 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "13" ]]; then
5959
sccache --stop-server >/dev/null 2>&1 || true
6060
fi
6161

62-
RAPIDS_PACKAGE_NAME="$(rapids-package-name conda_python cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")"
62+
RAPIDS_PACKAGE_NAME="$(rapids-artifact-name conda_python cuvs cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")"
6363
export RAPIDS_PACKAGE_NAME

ci/build_rust.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set -euo pipefail
66

77
rapids-logger "Downloading artifacts from previous jobs"
8-
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
8+
CPP_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")")
99

1010
rapids-logger "Create test conda environment"
1111
. /opt/conda/etc/profile.d/conda.sh

ci/build_wheel_cuvs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
1515
#
1616
# env variable 'PIP_CONSTRAINT' is set up by rapids-init-pip. It constrains all subsequent
1717
# 'pip install', 'pip download', etc. calls (except those used in 'pip wheel', handled separately in build scripts)
18-
LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp)
18+
LIBCUVS_WHEELHOUSE=$(rapids-download-from-github "$(rapids-artifact-name wheel_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")")
1919
echo "libcuvs-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBCUVS_WHEELHOUSE}"/libcuvs_*.whl)" >> "${PIP_CONSTRAINT}"
2020

2121
# TODO: move this variable into `ci-wheel`
@@ -26,5 +26,5 @@ export RAPIDS_PY_API
2626
ci/build_wheel.sh cuvs ${package_dir} --stable
2727
ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
2828

29-
RAPIDS_PACKAGE_NAME="$(rapids-package-name wheel_python cuvs --stable --cuda)"
29+
RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_python cuvs cuvs --stable --cuda)"
3030
export RAPIDS_PACKAGE_NAME

ci/build_wheel_libcuvs.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ export PIP_NO_BUILD_ISOLATION=0
3131

3232
ci/build_wheel.sh libcuvs ${package_dir}
3333
ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
34+
35+
RAPIDS_PACKAGE_NAME="$(rapids-artifact-name wheel_cpp libcuvs cuvs --cuda "$RAPIDS_CUDA_VERSION")"
36+
export RAPIDS_PACKAGE_NAME

0 commit comments

Comments
 (0)