From 7da6367cd0e64f568f306b6cf89207bfefd932e7 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 25 Jul 2023 16:06:47 -0500 Subject: [PATCH 01/14] Re-enable cucim and xgboost in CUDA 12 rapids builds. This reverts commit cc272c465fc8904737e284a3061b5284d2f3e054. --- conda/recipes/rapids/meta.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index 5c67863f..28a49a58 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 }}.* From 921f35e44b36fea064cd05e3529199ff27f1345a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 09:51:52 -0500 Subject: [PATCH 02/14] Update xgboost pinnings. --- conda/recipes/rapids-xgboost/meta.yaml | 3 ++- conda/recipes/versions.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index d466833e..19b130ca 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -34,7 +34,8 @@ requirements: {% endif %} - nccl {{ nccl_version }} - python - - xgboost {{ xgboost_version }}{{ major_minor_version }} + - xgboost {{ xgboost_version }} + - _py-xgboost-mutex=*=rapidsai* about: home: https://rapids.ai/ diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 248354cc..58ab03cf 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -9,7 +9,7 @@ dask_xgboost_version: # Versions for `rapids-xgboost` meta-pkg xgboost_version: # Minor version is appended in meta.yaml - - '=1.7.5dev.rapidsai' + - '=1.7.4' # Versions for conda conda_version: From 94173087138f9d32387f7af580040c96973ddd4f Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 12:14:33 -0500 Subject: [PATCH 03/14] Enable testing of conda packages. --- ci/build_python.sh | 2 -- conda/recipes/rapids/meta.yaml | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index 6512095c..2ed63575 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -12,14 +12,12 @@ rapids-print-env rapids-logger "Build rapids-xgboost" rapids-mamba-retry mambabuild \ - --no-test \ --variant-config-files "${CONDA_CONFIG_FILE}" \ conda/recipes/rapids-xgboost rapids-logger "Build rapids" rapids-mamba-retry mambabuild \ - --no-test \ --variant-config-files "${CONDA_CONFIG_FILE}" \ conda/recipes/rapids diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index 28a49a58..f44caf3e 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -61,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: + 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/ From d1aab9c9c9e3f94bb94edda7a1c5c9ee0d3f756c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 10:19:25 -0700 Subject: [PATCH 04/14] Fix cuda_version to cuda-version. --- conda/recipes/rapids-xgboost/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 19b130ca..e13b1183 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -28,7 +28,7 @@ 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 %} From 8b16f6baabe280e2da24421c19b1431ee187836d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 13:01:18 -0500 Subject: [PATCH 05/14] Update conda/recipes/rapids-xgboost/meta.yaml Co-authored-by: jakirkham --- conda/recipes/rapids-xgboost/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index e13b1183..47c0566d 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -34,7 +34,7 @@ requirements: {% endif %} - nccl {{ nccl_version }} - python - - xgboost {{ xgboost_version }} + - xgboost {{ xgboost_version }} rapidsai_cuda* - _py-xgboost-mutex=*=rapidsai* about: From e9a1ff8ff3c071a060d4ac5b6ed8b1a2e5e7c8f1 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 13:01:25 -0500 Subject: [PATCH 06/14] Update conda/recipes/rapids-xgboost/meta.yaml Co-authored-by: jakirkham --- conda/recipes/rapids-xgboost/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 47c0566d..31ec5597 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -35,7 +35,6 @@ requirements: - nccl {{ nccl_version }} - python - xgboost {{ xgboost_version }} rapidsai_cuda* - - _py-xgboost-mutex=*=rapidsai* about: home: https://rapids.ai/ From 8e32ca7c51199ca1a83fa4adb2711f8349426f64 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 14:39:33 -0700 Subject: [PATCH 07/14] Skip tests for rapids. --- ci/build_python.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/build_python.sh b/ci/build_python.sh index 2ed63575..348e85bf 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -17,7 +17,10 @@ rapids-mamba-retry mambabuild \ rapids-logger "Build rapids" +# TODO: --no-test is enabled because this depends on rapids-xgboost from the +# above recipe. These should be built as a single recipe to avoid that problem. rapids-mamba-retry mambabuild \ + --no-test \ --variant-config-files "${CONDA_CONFIG_FILE}" \ conda/recipes/rapids From 1b215458f9ca30762dde48529bf7de7cfbadcd86 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 16:56:34 -0500 Subject: [PATCH 08/14] Enable --use-local. Co-authored-by: jakirkham --- ci/build_python.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index 348e85bf..30ecd6b7 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -12,15 +12,14 @@ rapids-print-env rapids-logger "Build rapids-xgboost" rapids-mamba-retry mambabuild \ + --use-local \ --variant-config-files "${CONDA_CONFIG_FILE}" \ conda/recipes/rapids-xgboost rapids-logger "Build rapids" -# TODO: --no-test is enabled because this depends on rapids-xgboost from the -# above recipe. These should be built as a single recipe to avoid that problem. rapids-mamba-retry mambabuild \ - --no-test \ + --use-local \ --variant-config-files "${CONDA_CONFIG_FILE}" \ conda/recipes/rapids From e7ebe5db8ac1fa0a1ddc5c79e17cadb12df58365 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 15:06:02 -0700 Subject: [PATCH 09/14] Use CONDA_OVERRIDE_CUDA. --- ci/build_python.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/build_python.sh b/ci/build_python.sh index 348e85bf..f66b20e6 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -6,6 +6,7 @@ set -euo pipefail source rapids-env-update CONDA_CONFIG_FILE="conda/recipes/versions.yaml" +CONDA_OVERRIDE_CUDA="${RAPIDS_CUDA_VERSION}" rapids-print-env From 264fa109034c512fca8da2bd8ff0e40d165a126d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 17:30:36 -0500 Subject: [PATCH 10/14] Update ci/build_python.sh Co-authored-by: jakirkham --- ci/build_python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index cdc4e0a6..db51d157 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -6,7 +6,7 @@ set -euo pipefail source rapids-env-update CONDA_CONFIG_FILE="conda/recipes/versions.yaml" -CONDA_OVERRIDE_CUDA="${RAPIDS_CUDA_VERSION}" +export CONDA_OVERRIDE_CUDA="${RAPIDS_CUDA_VERSION}" rapids-print-env From 6b0f77bd1f0dba73d107c4414629f772c6c7d23d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 17:30:49 -0500 Subject: [PATCH 11/14] Update conda/recipes/rapids/meta.yaml Co-authored-by: jakirkham --- conda/recipes/rapids/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index f44caf3e..d0448aaf 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -62,6 +62,8 @@ requirements: - conda-forge::ucx {{ ucx_version }} test: + requires: + - cuda-version ={{ cuda_version }} imports: - cucim - cudf From 2d55e205e0ba93d64687e820dcd59d7c243aad66 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 17:31:00 -0500 Subject: [PATCH 12/14] Update conda/recipes/rapids-xgboost/meta.yaml Co-authored-by: jakirkham --- conda/recipes/rapids-xgboost/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 31ec5597..1fc9fe99 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -36,6 +36,10 @@ requirements: - python - xgboost {{ xgboost_version }} rapidsai_cuda* +test: + requires: + - cuda-version ={{ cuda_version }} + about: home: https://rapids.ai/ license: Custom From a2bcb838d00f3e7d916c90f914d0c24c6a09becf Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 26 Jul 2023 15:57:25 -0700 Subject: [PATCH 13/14] Stop testing imports but ensure an environment is created --- conda/recipes/rapids/meta.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index d0448aaf..a7344d17 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -64,22 +64,8 @@ requirements: test: requires: - cuda-version ={{ cuda_version }} - imports: - - cucim - - cudf - - cudf_kafka - - cugraph - - cuml - {% if cuda_major == "11" %} - - cusignal - {% endif %} - - cuspatial - - custreamz - - cuxfilter - - dask_cuda - - dask_cudf - - pylibcugraph - - rmm + commands: + - exit 0 about: home: https://rapids.ai/ From 3743b2bc27b561a91ac38b11c04e37250ac3a5aa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 26 Jul 2023 18:29:39 -0500 Subject: [PATCH 14/14] Update conda/recipes/rapids-xgboost/meta.yaml Co-authored-by: jakirkham --- conda/recipes/rapids-xgboost/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/recipes/rapids-xgboost/meta.yaml b/conda/recipes/rapids-xgboost/meta.yaml index 1fc9fe99..36d5eb06 100644 --- a/conda/recipes/rapids-xgboost/meta.yaml +++ b/conda/recipes/rapids-xgboost/meta.yaml @@ -39,6 +39,8 @@ requirements: test: requires: - cuda-version ={{ cuda_version }} + commands: + - exit 0 about: home: https://rapids.ai/