Forward merge from release/26.04 - #7910
Conversation
This PR sets an upper bound on the `numba-cuda` dependency to `<0.29.0` Authors: - https://github.com/brandon-b-miller - Jim Crist-Harif (https://github.com/jcrist) Approvers: - Gil Forsyth (https://github.com/gforsyth) - Jim Crist-Harif (https://github.com/jcrist) URL: NVIDIA#7900
Closes NVIDIA#3148 Authors: - Simon Adorf (https://github.com/csadorf) Approvers: - Victor Lafargue (https://github.com/viclafargue) - Jim Crist-Harif (https://github.com/jcrist) - Gil Forsyth (https://github.com/gforsyth) URL: NVIDIA#7887
Addresses rapidsai/build-planning#247 Authors: - Simon Adorf (https://github.com/csadorf) - Jim Crist-Harif (https://github.com/jcrist) Approvers: - Divye Gala (https://github.com/divyegala) - Jim Crist-Harif (https://github.com/jcrist) - Gil Forsyth (https://github.com/gforsyth) URL: NVIDIA#7857
📝 WalkthroughSummary by CodeRabbit
WalkthroughThis PR updates dependency version constraints across conda environments, recipes, and Python project configurations. Key changes include adding an upper bound to numba-cuda (<0.29.0), bumping scipy minimum from >=1.13.0 to >=1.14.0, and updating scikit-learn and treelite versions in documentation. Additionally, the pytest marker Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
📝 Coding Plan
Comment Tip You can make CodeRabbit's review stricter and more nitpicky using the `assertive` profile, if that's what you prefer.Change the |
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@conda/recipes/cuml/recipe.yaml`:
- Around line 102-105: Update the scikit-learn minimum version in the conda
recipe by changing the dependency string "scikit-learn >=1.4" to match the
documented constraint "scikit-learn >=1.5"; locate the dependency list in the
recipe.yaml where the dependencies include "numba-cuda", "numpy",
"scikit-learn", and "scipy" and replace the scikit-learn version specifier so it
aligns with pyproject.toml, dependencies.yaml, and supported_versions.rst.
In `@docs/source/supported_versions.rst`:
- Line 18: Update the documented treelite minimum version string that currently
reads "treelite: >=4.6.1,<5.0.0" to match the actual package constraints
"treelite: >=4.7.0,<5.0.0"; verify against the authoritative constraints in
pyproject.toml and dependencies.yaml and ensure the entry in
supported_versions.rst (the treelite line) is edited accordingly so docs and
package constraints are consistent.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 5ea02902-6d45-43f5-84fc-f0c8c7cff7b8
📒 Files selected for processing (9)
conda/environments/all_cuda-129_arch-aarch64.yamlconda/environments/all_cuda-129_arch-x86_64.yamlconda/environments/all_cuda-131_arch-aarch64.yamlconda/environments/all_cuda-131_arch-x86_64.yamlconda/recipes/cuml/recipe.yamldependencies.yamldocs/source/supported_versions.rstpython/cuml/pyproject.tomlpython/cuml/tests/test_incremental_pca.py
💤 Files with no reviewable changes (1)
- python/cuml/tests/test_incremental_pca.py
| - numba-cuda >=0.22.2,<0.29.0 | ||
| - numpy >=1.23,<3.0 | ||
| - scikit-learn >=1.4 | ||
| - scipy >=1.11.0 | ||
| - scipy >=1.14.0 |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
# Compare sklearn minimum constraints across the files provided in this PR context
rg -n 'scikit-learn' \
conda/recipes/cuml/recipe.yaml \
dependencies.yaml \
python/cuml/pyproject.toml \
docs/source/supported_versions.rstRepository: rapidsai/cuml
Length of output: 533
Update scikit-learn minimum to match documented constraint.
Line 104 specifies scikit-learn >=1.4 while the documentation and all other dependency definitions (pyproject.toml, dependencies.yaml, supported_versions.rst) require scikit-learn >=1.5. This inconsistency allows conda environments below the tested minimum.
Proposed fix
- - scikit-learn >=1.4
+ - scikit-learn >=1.5📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| - numba-cuda >=0.22.2,<0.29.0 | |
| - numpy >=1.23,<3.0 | |
| - scikit-learn >=1.4 | |
| - scipy >=1.11.0 | |
| - scipy >=1.14.0 | |
| - numba-cuda >=0.22.2,<0.29.0 | |
| - numpy >=1.23,<3.0 | |
| - scikit-learn >=1.5 | |
| - scipy >=1.14.0 |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@conda/recipes/cuml/recipe.yaml` around lines 102 - 105, Update the
scikit-learn minimum version in the conda recipe by changing the dependency
string "scikit-learn >=1.4" to match the documented constraint "scikit-learn
>=1.5"; locate the dependency list in the recipe.yaml where the dependencies
include "numba-cuda", "numpy", "scikit-learn", and "scipy" and replace the
scikit-learn version specifier so it aligns with pyproject.toml,
dependencies.yaml, and supported_versions.rst.
| * **numba**: >=0.60.0,<0.62.0a0 | ||
| * **cupy**: cupy-cuda12x>=13.6.0 (CUDA 12), cupy-cuda13x>=13.6.0 (CUDA 13) | ||
| * **treelite**: ==4.4.1 | ||
| * **treelite**: >=4.6.1,<5.0.0 |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
# Verify treelite constraints in docs vs packaging metadata/source-of-truth
rg -n 'treelite' docs/source/supported_versions.rst \
dependencies.yaml \
python/cuml/pyproject.toml \
conda/recipes/cuml/recipe.yamlRepository: rapidsai/cuml
Length of output: 504
Align treelite minimum in docs with the actual package floor.
Line 18 documents treelite>=4.6.1,<5.0.0, but the actual package constraints are >=4.7.0,<5.0.0 (per pyproject.toml and dependencies.yaml). This mismatch can direct users to unsupported versions.
Proposed fix
-* **treelite**: >=4.6.1,<5.0.0
+* **treelite**: >=4.7.0,<5.0.0📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| * **treelite**: >=4.6.1,<5.0.0 | |
| * **treelite**: >=4.7.0,<5.0.0 |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@docs/source/supported_versions.rst` at line 18, Update the documented
treelite minimum version string that currently reads "treelite: >=4.6.1,<5.0.0"
to match the actual package constraints "treelite: >=4.7.0,<5.0.0"; verify
against the authoritative constraints in pyproject.toml and dependencies.yaml
and ensure the entry in supported_versions.rst (the treelite line) is edited
accordingly so docs and package constraints are consistent.
|
Admin merging this to get |
Fixes merge conflicts in #7905.