Skip to content

Commit e22878d

Browse files
committed
test(ci): build against vyasr/raft#3019 (detail symbol visibility fix)
Temporarily points cuvs at vyasr/raft@fix/detail_symbol_export so CI exercises the fix that removes RAFT_EXPORT from detail namespace declarations in raft headers. Changes: - cpp/cmake/thirdparty/get_raft.cmake: RAFT_FORK=vyasr, RAFT_PINNED_TAG=fix/detail_symbol_export - ci/use_conda_packages_from_prs.sh: downloads libraft conda artifacts from NVIDIA/raft#3019 via rapids-get-pr-artifact - ci/use_wheels_from_prs.sh: downloads libraft wheel artifacts from NVIDIA/raft#3019 - All conda CI scripts (build_cpp, build_python, build_docs, build_go, build_java, build_rust, test_cpp, test_python): source use_conda_packages_from_prs.sh after conda strict channel priority - build_wheel_libcuvs.sh: source use_wheels_from_prs.sh after rapids-init-pip Revert these changes once NVIDIA/raft#3019 is merged and picked up by the nightly.
1 parent 03173f0 commit e22878d

12 files changed

Lines changed: 65 additions & 7 deletions

ci/build_cpp.sh

Lines changed: 3 additions & 2 deletions
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
@@ -22,8 +22,9 @@ RAPIDS_ARTIFACTS_DIR=${RAPIDS_ARTIFACTS_DIR:-"${PWD}/artifacts"}
2222
mkdir -p "${RAPIDS_ARTIFACTS_DIR}"
2323
export RAPIDS_ARTIFACTS_DIR
2424

25+
source ./ci/use_conda_packages_from_prs.sh
26+
2527
# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
26-
source rapids-rattler-channel-string
2728

2829
# --no-build-id allows for caching with `sccache`
2930
# more info is available at

ci/build_docs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ rapids-logger "Create test conda environment"
1414
rapids-logger "Configuring conda strict channel priority"
1515
conda config --set channel_priority strict
1616

17+
source ./ci/use_conda_packages_from_prs.sh
18+
1719
RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
1820
export RAPIDS_VERSION_MAJOR_MINOR
1921

ci/build_go.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ rapids-logger "Create test conda environment"
1313
rapids-logger "Configuring conda strict channel priority"
1414
conda config --set channel_priority strict
1515

16+
source ./ci/use_conda_packages_from_prs.sh
17+
1618
rapids-dependency-file-generator \
1719
--output conda \
1820
--file-key go \

ci/build_java.sh

Lines changed: 3 additions & 1 deletion
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
@@ -25,6 +25,8 @@ fi
2525
rapids-logger "Configuring conda strict channel priority"
2626
conda config --set channel_priority strict
2727

28+
source ./ci/use_conda_packages_from_prs.sh
29+
2830
rapids-logger "Downloading artifacts from previous jobs"
2931
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
3032

ci/build_python.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ version=$(rapids-generate-version)
1919
export RAPIDS_PACKAGE_VERSION=${version}
2020
echo "${version}" > VERSION
2121

22+
source ./ci/use_conda_packages_from_prs.sh
23+
2224
# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
23-
source rapids-rattler-channel-string
2425

2526
rapids-logger "Prepending channel ${CPP_CHANNEL} to RATTLER_CHANNELS"
2627

ci/build_rust.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ rapids-logger "Create test conda environment"
1313
rapids-logger "Configuring conda strict channel priority"
1414
conda config --set channel_priority strict
1515

16+
source ./ci/use_conda_packages_from_prs.sh
17+
1618
rapids-dependency-file-generator \
1719
--output conda \
1820
--file-key rust \

ci/build_wheel_libcuvs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ set -euo pipefail
66

77
source rapids-init-pip
88

9+
source ./ci/use_wheels_from_prs.sh
10+
911
package_name="libcuvs"
1012
package_dir="python/libcuvs"
1113

ci/test_cpp.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ set -euo pipefail
99
rapids-logger "Configuring conda strict channel priority"
1010
conda config --set channel_priority strict
1111

12+
source ./ci/use_conda_packages_from_prs.sh
13+
1214
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
1315

1416
rapids-logger "Generate C++ testing dependencies"

ci/test_python.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ set -euo pipefail
99
rapids-logger "Configuring conda strict channel priority"
1010
conda config --set channel_priority strict
1111

12+
source ./ci/use_conda_packages_from_prs.sh
13+
1214
rapids-logger "Downloading artifacts from previous jobs"
1315
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
1416
PYTHON_CHANNEL=$(rapids-download-from-github "$(rapids-package-name "conda_python" cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")")

ci/use_conda_packages_from_prs.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
# Temporary: download libraft conda artifacts from rapidsai/raft#3019
6+
# (fix/detail_symbol_export — removes RAFT_EXPORT from detail namespaces)
7+
# Remove this file and all `source ./ci/use_conda_packages_from_prs.sh` calls
8+
# once that PR is merged and the nightly picks it up.
9+
10+
LIBRAFT_CHANNEL=$(rapids-get-pr-artifact raft 3019 cpp conda)
11+
12+
# For rattler builds: prepend to RAPIDS_PREPENDED_CONDA_CHANNELS so that
13+
# rapids-rattler-channel-string picks them up with strict channel priority.
14+
RAPIDS_PREPENDED_CONDA_CHANNELS=(
15+
"${LIBRAFT_CHANNEL}"
16+
)
17+
export RAPIDS_PREPENDED_CONDA_CHANNELS
18+
19+
# For mamba/conda installs: prepend to the system-wide channel list.
20+
for _channel in "${RAPIDS_PREPENDED_CONDA_CHANNELS[@]}"; do
21+
conda config --system --add channels "${_channel}"
22+
done

0 commit comments

Comments
 (0)