Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ concurrency:
jobs:
build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -44,7 +44,7 @@ jobs:
upload-conda:
needs: [build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda13.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -53,7 +53,7 @@ jobs:
conda-pack:
needs: [upload-conda]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- build
- test-conda-nightly-env
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda13.0
checks:
runs-on: ubuntu-latest
steps:
Expand All @@ -26,15 +26,15 @@ jobs:
build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0
with:
build_type: pull-request
script: ci/build_python.sh
test-conda-nightly-env:
needs: checks
secrets: inherit
# We use a build workflow so that we get CPU jobs and high matrix coverage
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0
with:
build_type: pull-request
script: "ci/test_conda_nightly_env.sh"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
test-conda-nightly-env:
secrets: inherit
# We use a build workflow so that we get CPU jobs and high matrix coverage
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0
with:
build_type: pull-request
script: "ci/test_conda_nightly_env.sh"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-breaking-change-alert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.10
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@cuda13.0
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
Expand Down
18 changes: 12 additions & 6 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ CONDA_CONFIG_FILE="conda/recipes/versions.yaml"

rapids-print-env

rapids-logger "Build rapids-xgboost"

rattler-build build --recipe conda/recipes/rapids-xgboost \
--variant-config "${CONDA_CONFIG_FILE}" \
"${RATTLER_ARGS[@]}" \
"${RATTLER_CHANNELS[@]}"
CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"

# TODO: add rapids-xgboost back when there are CUDA 13 packages
# ref: https://github.com/rapidsai/xgboost-feedstock/issues/100
if [[ "${CUDA_MAJOR}" == "12" ]]; then
rapids-logger "Build rapids-xgboost"

rattler-build build --recipe conda/recipes/rapids-xgboost \
--variant-config "${CONDA_CONFIG_FILE}" \
"${RATTLER_ARGS[@]}" \
"${RATTLER_CHANNELS[@]}"
fi

rapids-logger "Build rapids"

Expand Down
6 changes: 5 additions & 1 deletion conda/recipes/rapids/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ requirements:
- custreamz ${{ minor_version }}.*
- cuxfilter ${{ minor_version }}.*
- dask-cuda ${{ minor_version }}.*
- rapids-xgboost ${{ minor_version }}.*
# TODO: use rapids-xgboost CUDA packages unconditionally when there are CUDA 13 packages
# ref: https://github.com/rapidsai/xgboost-feedstock/issues/100
- if: cuda_major == "12"
then: rapids-xgboost ${{ minor_version }}.*
else: conda-forge::xgboost ${{ xgboost_version }} cpu_*
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having CPU xgboost is better than no xgboost at all, I think, for anything that was relying on the rapids package to pull in xgboost.

I'm thinking this might matter for cuML notebook testing in https://github.com/rapidsai/docker, for example

- rmm ${{ minor_version }}.*
- pylibcugraph ${{ minor_version }}.*
- libcugraph_etl ${{ minor_version }}.*
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ xgboost_version:
- '=3.0.3'

cupy_version:
- '>=12.0.0'
- '>=13.6.0'
nccl_version:
- '>=2.19,<3.0a0'
numpy_version:
- '>=1.23,<3.0a0'
nvtx_version:
- '>=0.2.1,<0.3'
ucx_version:
- '>=1.15.0,<1.19.0'
- '>=1.15.0,<1.20.0'
Loading