Skip to content

Commit

Permalink
Re-enable cucim and xgboost in CUDA 12 rapids builds. (#669)
Browse files Browse the repository at this point in the history
PR #664 temporarily disabled CUDA 12 packages for cucim and xgboost in `rapids`. This re-enables those.

This reverts commit cc272c4.

This can be merged once the following issues are closed:
- rapidsai/cucim#513
- rapidsai/xgboost-feedstock#4

Authors:
  - Bradley Dice (https://github.com/bdice)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - https://github.com/jakirkham
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #669
  • Loading branch information
bdice authored Jul 27, 2023
1 parent eae0588 commit f0c7766
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 30 deletions.
5 changes: 3 additions & 2 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@ set -euo pipefail
source rapids-env-update

CONDA_CONFIG_FILE="conda/recipes/versions.yaml"
export CONDA_OVERRIDE_CUDA="${RAPIDS_CUDA_VERSION}"

rapids-print-env

rapids-logger "Build rapids-xgboost"

rapids-mamba-retry mambabuild \
--no-test \
--use-local \
--variant-config-files "${CONDA_CONFIG_FILE}" \
conda/recipes/rapids-xgboost

rapids-logger "Build rapids"

rapids-mamba-retry mambabuild \
--no-test \
--use-local \
--variant-config-files "${CONDA_CONFIG_FILE}" \
conda/recipes/rapids

Expand Down
10 changes: 8 additions & 2 deletions conda/recipes/rapids-xgboost/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,19 @@ requirements:
- python
- cuda-version ={{ cuda_version }}
run:
- {{ pin_compatible('cuda_version', max_pin='x', min_pin='x') }}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
- cudatoolkit
{% endif %}
- nccl {{ nccl_version }}
- python
- xgboost {{ xgboost_version }}{{ major_minor_version }}
- xgboost {{ xgboost_version }} rapidsai_cuda*

test:
requires:
- cuda-version ={{ cuda_version }}
commands:
- exit 0

about:
home: https://rapids.ai/
Expand Down
30 changes: 5 additions & 25 deletions conda/recipes/rapids/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,12 @@ requirements:
- cudf ={{ major_minor_version }}.*
- cugraph ={{ major_minor_version }}.*
- cuml ={{ major_minor_version }}.*
{% if cuda_major == "11" %}
# Temporarily disabled on CUDA 12 until
# https://github.com/rapidsai/cucim/issues/513 is complete
- cucim ={{ major_minor_version }}.*
{% endif %}
- cuspatial ={{ major_minor_version }}.*
- custreamz ={{ major_minor_version }}.*
- cuxfilter ={{ major_minor_version }}.*
- dask-cuda ={{ major_minor_version }}.*
{% if cuda_major == "11" %}
# Temporarily disabled on CUDA 12 until
# https://github.com/rapidsai/xgboost-feedstock/issues/4 is complete
- rapids-xgboost ={{ major_minor_version }}.*
{% endif %}
- rmm ={{ major_minor_version }}.*
- pylibcugraph ={{ major_minor_version }}.*
- libcugraph_etl ={{ major_minor_version }}.*
Expand All @@ -69,23 +61,11 @@ requirements:
- conda-forge::ucx-proc=*=gpu
- conda-forge::ucx {{ ucx_version }}

test: # [linux64]
imports: # [linux64]
- cucim # [linux64]
- cudf # [linux64]
- cudf_kafka # [linux64]
- cugraph # [linux64]
- cuml # [linux64]
{% if cuda_major == "11" %}
- cusignal # [linux64]
{% endif %}
- cuspatial # [linux64]
- custreamz # [linux64]
- cuxfilter # [linux64]
- dask_cuda # [linux64]
- dask_cudf # [linux64]
- pylibcugraph # [linux64]
- rmm # [linux64]
test:
requires:
- cuda-version ={{ cuda_version }}
commands:
- exit 0

about:
home: https://rapids.ai/
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/versions.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Versions for `rapids-xgboost` meta-pkg
xgboost_version:
# Minor version is appended in meta.yaml
- '=1.7.5dev.rapidsai'
- '=1.7.4'

cuda11_cuda_python_version:
- '>=11.7.1,<12.0a'
Expand Down

0 comments on commit f0c7766

Please sign in to comment.