Skip to content

Re-enable cucim and xgboost in CUDA 12 rapids builds. #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 17 commits into from
Jul 27, 2023
Merged

Re-enable cucim and xgboost in CUDA 12 rapids builds. #669

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7da6367
Re-enable cucim and xgboost in CUDA 12 rapids builds.
bdice Jul 25, 2023
921f35e
Update xgboost pinnings.
bdice Jul 26, 2023
f4660ee
Merge remote-tracking branch 'upstream/branch-23.08' into enable-cuda…
bdice Jul 26, 2023
9417308
Enable testing of conda packages.
bdice Jul 26, 2023
d1aab9c
Fix cuda_version to cuda-version.
bdice Jul 26, 2023
8b16f6b
Update conda/recipes/rapids-xgboost/meta.yaml
bdice Jul 26, 2023
e9a1ff8
Update conda/recipes/rapids-xgboost/meta.yaml
bdice Jul 26, 2023
8e32ca7
Skip tests for rapids.
bdice Jul 26, 2023
9a1ab9d
Merge branch 'enable-cuda-12-cucim-xgboost' of github.com:bdice/integ…
bdice Jul 26, 2023
1b21545
Enable --use-local.
bdice Jul 26, 2023
e7ebe5d
Use CONDA_OVERRIDE_CUDA.
bdice Jul 26, 2023
328f27f
Merge branch 'enable-cuda-12-cucim-xgboost' of github.com:bdice/integ…
bdice Jul 26, 2023
264fa10
Update ci/build_python.sh
bdice Jul 26, 2023
6b0f77b
Update conda/recipes/rapids/meta.yaml
bdice Jul 26, 2023
2d55e20
Update conda/recipes/rapids-xgboost/meta.yaml
bdice Jul 26, 2023
a2bcb83
Stop testing imports but ensure an environment is created
vyasr Jul 26, 2023
3743b2b
Update conda/recipes/rapids-xgboost/meta.yaml
bdice Jul 26, 2023
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
4 changes: 2 additions & 2 deletions ci/build_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ rapids-print-env
rapids-logger "Build rapids-xgboost"

Comment thread
bdice marked this conversation as resolved.
rapids-mamba-retry mambabuild \
--no-test \
--use-local \
--variant-config-files "${CONDA_CONFIG_FILE}" \
Comment thread
bdice marked this conversation as resolved.
conda/recipes/rapids-xgboost

rapids-logger "Build rapids"

rapids-mamba-retry mambabuild \
--no-test \
--use-local \

@ajschmidt8 ajschmidt8 Jul 27, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

just want to mention that for other repos, we use --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}": https://github.com/rapidsai/cudf/blob/abb59c83128f956c7edcb4d7744cb0faecf0026c/ci/build_python.sh#L18-L39

RAPIDS_CONDA_BLD_OUTPUT_DIR is set in our CI images: https://github.com/rapidsai/ci-imgs/blob/75cad918c44c6e00480001b24cb764e1b43fa0a5/Dockerfile#L108-L113

It looks like --use-local works, I'm just pointing this out in case we want consistency.

@jakirkham jakirkham Aug 1, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yeah --use-local will check the same things. Please see this list of paths that Conda checks when --use-local is set

--variant-config-files "${CONDA_CONFIG_FILE}" \
conda/recipes/rapids

Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/rapids-xgboost/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ 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*

Comment thread
bdice marked this conversation as resolved.
about:
home: https://rapids.ai/
Expand Down
38 changes: 15 additions & 23 deletions conda/recipes/rapids/meta.yaml
View file
Open in desktop
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,23 @@ 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]
test:
Comment thread
bdice marked this conversation as resolved.
imports:
- cucim
- cudf
- cudf_kafka
- cugraph
- cuml
{% if cuda_major == "11" %}
- cusignal # [linux64]
- cusignal
{% endif %}
- cuspatial # [linux64]
- custreamz # [linux64]
- cuxfilter # [linux64]
- dask_cuda # [linux64]
- dask_cudf # [linux64]
- pylibcugraph # [linux64]
- rmm # [linux64]
- cuspatial
- custreamz
- cuxfilter
- dask_cuda
- dask_cudf
- pylibcugraph
- rmm

about:
home: https://rapids.ai/
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/versions.yaml
View file
Open in desktop
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'
Comment thread
bdice marked this conversation as resolved.

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