Skip to content

Commit de748d8

Browse files
authored
refactor(rattler): enable strict channel priority for builds (#823)
This PR enables strict channel priority for building conda packages with `rattler-build`. xref rapidsai/build-planning#84 Authors: - Gil Forsyth (https://github.com/gforsyth) - https://github.com/jakirkham Approvers: - Bradley Dice (https://github.com/bdice) URL: #823
1 parent 35f21e6 commit de748d8

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

ci/build_cpp.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,14 @@ sccache --zero-stats
2121
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version)
2222
export RAPIDS_PACKAGE_VERSION
2323

24+
# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
2425
source rapids-rattler-channel-string
2526

2627
# --no-build-id allows for caching with `sccache`
2728
# more info is available at
2829
# https://rattler.build/latest/tips_and_tricks/#using-sccache-or-ccache-with-rattler-build
2930
rattler-build build --recipe conda/recipes/libcuvs \
30-
--experimental \
31-
--no-build-id \
32-
--channel-priority disabled \
33-
--output-dir "$RAPIDS_CONDA_BLD_OUTPUT_DIR" \
31+
"${RATTLER_ARGS[@]}" \
3432
"${RATTLER_CHANNELS[@]}"
3533

3634
sccache --show-adv-stats

ci/build_python.sh

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ echo "${version}" > VERSION
2424
sccache --zero-stats
2525

2626

27-
# populates `RATTLER_CHANNELS` array
27+
# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
2828
source rapids-rattler-channel-string
2929

3030
rapids-logger "Prepending channel ${CPP_CHANNEL} to RATTLER_CHANNELS"
@@ -39,22 +39,15 @@ rapids-logger "Building cuvs"
3939
# more info is available at
4040
# https://rattler.build/latest/tips_and_tricks/#using-sccache-or-ccache-with-rattler-build
4141
rattler-build build --recipe conda/recipes/cuvs \
42-
--experimental \
43-
--no-build-id \
44-
--channel-priority disabled \
45-
--output-dir "$RAPIDS_CONDA_BLD_OUTPUT_DIR" \
46-
--test skip \
42+
"${RATTLER_ARGS[@]}" \
4743
"${RATTLER_CHANNELS[@]}"
4844

4945
sccache --show-adv-stats
5046
sccache --zero-stats
5147

5248
rattler-build build --recipe conda/recipes/cuvs-bench \
53-
--experimental \
54-
--no-build-id \
55-
--channel-priority disabled \
56-
--output-dir "$RAPIDS_CONDA_BLD_OUTPUT_DIR" \
5749
--test skip \
50+
"${RATTLER_ARGS[@]}" \
5851
"${RATTLER_CHANNELS[@]}"
5952

6053
sccache --show-adv-stats
@@ -65,10 +58,7 @@ sccache --zero-stats
6558
RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"
6659
if [[ ${RAPIDS_CUDA_MAJOR} == "12" ]]; then
6760
rattler-build build --recipe conda/recipes/cuvs-bench-cpu \
68-
--experimental \
69-
--no-build-id \
70-
--channel-priority disabled \
71-
--output-dir "$RAPIDS_CONDA_BLD_OUTPUT_DIR" \
61+
"${RATTLER_ARGS[@]}" \
7262
"${RATTLER_CHANNELS[@]}"
7363
sccache --show-adv-stats
7464
fi

0 commit comments

Comments
 (0)