From f0c77666a31a1e4e8111f2e37572a5e2761d24ba Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 27 Jul 2023 09:41:25 -0500 Subject: [PATCH] Re-enable cucim and xgboost in CUDA 12 rapids builds. (#669) PR #664 temporarily disabled CUDA 12 packages for cucim and xgboost in `rapids`. This re-enables those. This reverts commit cc272c465fc8904737e284a3061b5284d2f3e054. This can be merged once the following issues are closed: - https://github.com/rapidsai/cucim/issues/513 - https://github.com/rapidsai/xgboost-feedstock/issues/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: https://github.com/rapidsai/integration/pull/669 --- ci/build_python.sh | 5 +++-- conda/recipes/rapids-xgboost/meta.yaml | 10 +++++++-- conda/recipes/rapids/meta.yaml | 30 +++++--------------------- conda/recipes/versions.yaml | 2 +- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index 6512095c..db51d157 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -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 diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index d466833e..36d5eb06 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -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/ diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index 5c67863f..a7344d17 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -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 }}.* @@ -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/ diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index c54b1edc..2c60d303 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -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'