Skip to content

merge release/26.06 into main - #22717

Merged
jameslamb merged 3 commits into
NVIDIA:mainfrom
jameslamb:main-merge-release/26.06
May 29, 2026
Merged

merge release/26.06 into main#22717
jameslamb merged 3 commits into
NVIDIA:mainfrom
jameslamb:main-merge-release/26.06

Conversation

@jameslamb

Copy link
Copy Markdown
Member

Description

Closes #22709

Fixes forward-merger conflicts.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

jameslamb and others added 3 commits May 29, 2026 10:03
Contributes to rapidsai/build-planning#284

To reduce the risk of users encountering a known runtime issue with
`cupy` and `torch`, RAPIDS 26.06 is taking on a requirement
`cupy!=14.1.0`.

See the linked issue for details.
## Description
Replace benchmarks in the cudf-polars docs with updated PDS-DS results
collected using the updated GPU engine with rapidsmpf.

Closes NVIDIA#21471
@jameslamb
jameslamb requested a review from a team as a code owner May 29, 2026 21:14
@jameslamb
jameslamb requested a review from KyleFromNVIDIA May 29, 2026 21:14
@github-actions github-actions Bot added Python Affects Python cuDF API. pylibcudf Issues specific to the pylibcudf package labels May 29, 2026
@GPUtester GPUtester moved this to In Progress in cuDF Python May 29, 2026
@jameslamb

Copy link
Copy Markdown
Member Author

The conflict resolutions were straightforward and non-controversial, cancelling CI to save resources and admin no-squash merging this.

@jameslamb
jameslamb merged commit b99f73f into NVIDIA:main May 29, 2026
38 of 49 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in cuDF Python May 29, 2026
@jameslamb
jameslamb deleted the main-merge-release/26.06 branch May 29, 2026 21:16
@coderabbitai

coderabbitai Bot commented May 29, 2026

Copy link
Copy Markdown

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: c2208d03-0cdd-4e44-9329-d9dcb4376067

📥 Commits

Reviewing files that changed from the base of the PR and between 8f0f5d0 and abffe7f.

⛔ Files ignored due to path filters (4)
  • docs/cudf/source/_static/polars_pdsds_sf1k.png is excluded by !**/*.png
  • docs/cudf/source/_static/polars_pdsds_sf3k.png is excluded by !**/*.png
  • docs/cudf/source/_static/polars_pdsh_sf1k.png is excluded by !**/*.png
  • docs/cudf/source/_static/polars_pdsh_sf3k.png is excluded by !**/*.png
📒 Files selected for processing (10)
  • conda/environments/all_cuda-129_arch-aarch64.yaml
  • conda/environments/all_cuda-129_arch-x86_64.yaml
  • conda/environments/all_cuda-132_arch-aarch64.yaml
  • conda/environments/all_cuda-132_arch-x86_64.yaml
  • conda/recipes/cudf/recipe.yaml
  • dependencies.yaml
  • docs/cudf/source/cudf_polars/index.md
  • python/cudf/pyproject.toml
  • python/dask_cudf/pyproject.toml
  • python/pylibcudf/pyproject.toml

📝 Walkthrough

Summary by CodeRabbit

  • Chores

    • Updated CuPy dependency version constraints across conda environments, conda recipes, and Python project configurations to exclude additional incompatible package versions.
  • Documentation

    • Refreshed Polars GPU engine documentation with new benchmark narratives, comparative performance information, and single-GPU to multi-GPU scaling details.

Walkthrough

This forward-merge from the release branch adds CuPy version 14.1.0 exclusions to conda environments, conda recipes, and Python project dependencies across the cudf ecosystem, plus updates Polars GPU engine benchmark documentation with new table-based figures and simplified narrative.

Changes

CuPy 14.1.0 Version Exclusion and Documentation Updates

Layer / File(s) Summary
Conda environment and recipe CuPy 14.1.0 exclusions
conda/environments/all_cuda-129_arch-aarch64.yaml, conda/environments/all_cuda-129_arch-x86_64.yaml, conda/environments/all_cuda-132_arch-aarch64.yaml, conda/environments/all_cuda-132_arch-x86_64.yaml, conda/recipes/cudf/recipe.yaml
Four conda environment specs (CUDA 12.9 and 13.2 for both aarch64 and x86_64) and the cudf conda recipe each add !=14.1.0 to existing cupy>=13.6.0,!=14.0.0 constraints.
Python project dependency CuPy 14.1.0 exclusions
python/cudf/pyproject.toml, python/dask_cudf/pyproject.toml, python/pylibcudf/pyproject.toml
Core and optional dependency entries across three project configurations update cupy-cuda13x>=13.6.0,!=14.0.0 to cupy-cuda13x>=13.6.0,!=14.0.0,!=14.1.0.
Central dependency manifest CuPy 14.1.0 exclusions
dependencies.yaml
Three sections expand CuPy version constraints to exclude version 14.1.0: test requirements for cupy-cuda12x and cupy-cuda13x in test_python_cudf_common, conda list for depends_on_cupy, and requirements/pyproject matrices for CUDA-specific variants.
Polars GPU engine benchmark documentation
docs/cudf/source/cudf_polars/index.md
Benchmark section replaces static figures with new narrative text and two rendered table-based figure blocks for scale factors 1K and 3K, removes CUDA managed memory and reproduction details, and updates reference to PDS-DS queries.

🎯 2 (Simple) | ⏱️ ~10 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pylibcudf Issues specific to the pylibcudf package Python Affects Python cuDF API.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants