Skip to content

merge release/26.06 into main#2146

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

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

Conversation

@jameslamb

Copy link
Copy Markdown
Member

Closes #2113

Fixes forward-merge conflicts

jameslamb and others added 3 commits May 29, 2026 10:04
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.
Add missing visibility controls in IVF SQ
@jameslamb
jameslamb requested a review from a team as a code owner May 29, 2026 21:20
@jameslamb
jameslamb requested a review from gforsyth May 29, 2026 21:20
@jameslamb jameslamb added the improvement Improves an existing functionality label May 29, 2026
@jameslamb jameslamb added the non-breaking Introduces a non-breaking change label May 29, 2026
@jameslamb

Copy link
Copy Markdown
Member Author

This shows fewer commits than #2113 because #2140 was merged a few hours ago.

So it just has the 2 commits from release/26.06 that are missing on main + a merge commit fixing conflicts.

The conflict resolution was non-controversial (just re-generating the conda env files in conda/environments/). Stopping CI to save resources and admin no-squash merging this.

@coderabbitai

coderabbitai Bot commented May 29, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

This PR excludes CuPy versions 14.0.0 and 14.1.0 from all dependency constraints across the codebase. The change updates source dependency definitions, conda environment specifications for multiple CUDA versions, a conda recipe, and Python package test dependencies with consistent version exclusions while preserving the 13.6.0 minimum requirement.

Changes

CuPy version exclusion policy

Layer / File(s) Summary
Source dependency definitions
dependencies.yaml
Core dependency constraints are updated to exclude CuPy 14.0.0 and 14.1.0 for both unsuffixed and CUDA-suffixed cupy requirements and the CUDA-13 fallback alias.
Conda environment and recipe specifications
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/environments/bench_ann_cuda-129_arch-aarch64.yaml, conda/environments/bench_ann_cuda-129_arch-x86_64.yaml, conda/environments/bench_ann_cuda-132_arch-aarch64.yaml, conda/environments/bench_ann_cuda-132_arch-x86_64.yaml, conda/recipes/cuvs-bench/recipe.yaml
The version exclusions are applied consistently across all eight conda environment definitions for CUDA 12.9 and 13.2 on both architectures, plus the cuvs-bench conda recipe.
Python package test dependency constraint
python/cuvs/pyproject.toml
The test extra's cupy-cuda13x dependency is updated to exclude CuPy 14.0.0 and 14.1.0 alongside the minimum version requirement.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~5 minutes

Possibly related PRs

  • rapidsai/cuvs#2142: Updates the same CuPy dependency constraints across the same YAML/recipe/pyproject files to exclude specific CuPy 14.x versions.

Suggested reviewers

  • gforsyth
  • bdice
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description check ✅ Passed The description references the PR it closes and mentions resolving forward-merge conflicts, which is related to the changeset content.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title 'merge release/26.06 into main' accurately describes the primary action of this PR, which is a forward merge from the release branch into the main branch. It clearly conveys the main change from a git workflow perspective.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

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

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

@jameslamb jameslamb changed the title Main merge release/26.06 merge release/26.06 into main May 29, 2026
@jameslamb
jameslamb merged commit 257f369 into NVIDIA:main May 29, 2026
31 of 39 checks passed
@jameslamb
jameslamb deleted the main-merge-release/26.06 branch May 29, 2026 21:24
landrumb pushed a commit to landrumb/cuvs that referenced this pull request Jul 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

improvement Improves an existing functionality non-breaking Introduces a non-breaking change

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants