diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a6c1b80f..d9d6e4cb 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -69,7 +69,7 @@ jobs: packages: read pull-requests: read test-conda-nightly-env: - needs: checks + needs: [build] secrets: inherit # zizmor: ignore[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@release/26.10 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 740cc24a..d8bc66c2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -17,6 +17,10 @@ on: description: "sha: full git commit SHA to check out" required: true type: string + build_type: + description: "build_type: one of [branch, nightly, pull-request]" + type: string + default: nightly permissions: {} @@ -26,7 +30,10 @@ jobs: # 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@release/26.10 with: - build_type: pull-request + build_type: ${{ inputs.build_type }} + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} script: "ci/test_conda_nightly_env.sh" # just using the workflow to get the matrix, this isn't actually building anything we want to upload upload-artifacts: false diff --git a/ci/build_python.sh b/ci/build_python.sh index 0796643a..9542d012 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,16 +16,12 @@ 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[@]}" - rapids-logger "Build rapids" rattler-build build --recipe conda/recipes/rapids \ --variant-config "${CONDA_CONFIG_FILE}" \ "${RATTLER_ARGS[@]}" \ "${RATTLER_CHANNELS[@]}" + +RAPIDS_PACKAGE_NAME=$(rapids-artifact-name conda_python rapids integration --pure --arch any --cuda "$RAPIDS_CUDA_VERSION") +export RAPIDS_PACKAGE_NAME diff --git a/ci/check_conda_nightly_env.py b/ci/check_conda_nightly_env.py index f9a2b89d..21ed7070 100644 --- a/ci/check_conda_nightly_env.py +++ b/ci/check_conda_nightly_env.py @@ -9,13 +9,9 @@ EXCLUDED_PACKAGES = { # These packages are not built every night: "rapids", - "rapids-xgboost", # These packages do not have date strings: "rapids-dask-dependency", "rapids-logger", # Also not built every night - "libxgboost", - "py-xgboost", - "xgboost", } # ANSI color codes used to highlight lines diff --git a/ci/test_conda_nightly_env.sh b/ci/test_conda_nightly_env.sh index feed9a60..6c2cb60e 100755 --- a/ci/test_conda_nightly_env.sh +++ b/ci/test_conda_nightly_env.sh @@ -8,6 +8,8 @@ CUDA_VERSION=${RAPIDS_CUDA_VERSION%.*} JSON_FILENAME="rapids_cuda${CUDA_VERSION}_py${RAPIDS_PY_VERSION}.json" +RAPIDS_CHANNEL=$(rapids-download-from-github "$(rapids-artifact-name conda_python rapids integration --pure --arch any --cuda "$RAPIDS_CUDA_VERSION")") + rapids-logger "Configuring conda strict channel priority" conda config --set channel_priority strict @@ -16,6 +18,7 @@ rapids-logger "Creating conda environment with rapids=${RAPIDS_VERSION}, python= rapids-conda-retry \ create \ -n rapids-${RAPIDS_VERSION} \ + -c "${RAPIDS_CHANNEL}" \ -c rapidsai-nightly \ -c conda-forge \ rapids=${RAPIDS_VERSION} \ diff --git a/conda/recipes/README.md b/conda/recipes/README.md index e6c3778a..4c765abf 100644 --- a/conda/recipes/README.md +++ b/conda/recipes/README.md @@ -24,7 +24,6 @@ libraries to a RAPIDS release: Package Name | Purpose --- | --- `rapids` | Provide a one package install for all RAPIDS libraries, version matched to a RAPIDS release -`rapids-xgboost` | Defines the version of `xgboost` used for a RAPIDS release ## Managing Versions diff --git a/conda/recipes/rapids-xgboost/LICENSE b/conda/recipes/rapids-xgboost/LICENSE deleted file mode 100644 index d00c6281..00000000 --- a/conda/recipes/rapids-xgboost/LICENSE +++ /dev/null @@ -1 +0,0 @@ -The license of this package is a combination of the dependent packages contained herein. diff --git a/conda/recipes/rapids-xgboost/recipe.yaml b/conda/recipes/rapids-xgboost/recipe.yaml deleted file mode 100644 index 500738e1..00000000 --- a/conda/recipes/rapids-xgboost/recipe.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2025, NVIDIA CORPORATION. -schema_version: 1 - -context: - rapids_version: ${{ env.get("RAPIDS_PACKAGE_VERSION") }} - cuda_version: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[:2] | join(".") }} - cuda_major: '${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[0] }}' - datetime_string: '${{ env.get("RAPIDS_DATETIME_STRING") }}' - head_rev: ${{ git.head_rev(".")[:8] }} - -package: - name: rapids-xgboost - version: ${{ rapids_version }} - -source: - path: ../../.. - -build: - noarch: python - string: cuda${{ cuda_major }}_${{ datetime_string }}_${{ head_rev }} - -requirements: - host: - - cuda-version =${{ cuda_version }} - - pip - - python >=3.11 - run: - - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - - nccl ${{ nccl_version }} - - python - - libxgboost ${{ xgboost_version }} rapidsai_h* - - xgboost ${{ xgboost_version }} rapidsai_py* - ignore_run_exports: - by_name: - - python_abi - -about: - homepage: https://rapids.ai - license: LicenseRef-Custom - license_file: LICENSE - summary: RAPIDS Suite - Open GPU Data Science diff --git a/conda/recipes/rapids/recipe.yaml b/conda/recipes/rapids/recipe.yaml index 3071a599..f91ced5f 100644 --- a/conda/recipes/rapids/recipe.yaml +++ b/conda/recipes/rapids/recipe.yaml @@ -42,11 +42,11 @@ requirements: - cucim ${{ minor_version }}.* - custreamz ${{ minor_version }}.* - dask-cuda ${{ minor_version }}.* - - rapids-xgboost ${{ minor_version }}.* - rmm ${{ minor_version }}.* - pylibcugraph ${{ minor_version }}.* - libcugraph_etl ${{ minor_version }}.* - conda-forge::ucx ${{ ucx_version }} + - conda-forge::xgboost ${{ xgboost_version }} ignore_run_exports: by_name: - python_abi diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index d80cd996..81f461e7 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -1,8 +1,5 @@ -# Copyright (c) 2021-2025, NVIDIA CORPORATION. +# Copyright (c) 2021-2026, NVIDIA CORPORATION. -# Versions for `rapids-xgboost` meta-pkg -xgboost_version: - - '=3.3.0' cupy_version: - '>=13.6.0' @@ -14,3 +11,5 @@ nvtx_version: - '>=0.2.1,<0.3' ucx_version: - '>=1.15.0,<1.21.0' +xgboost_version: + - '>=3.4.0,<3.5.0'