Skip to content

Forward-merge branch-25.10 into branch-25.12#1401

Merged
GPUtester merged 1 commit into
branch-25.12from
branch-25.10
Sep 30, 2025
Merged

Forward-merge branch-25.10 into branch-25.12#1401
GPUtester merged 1 commit into
branch-25.12from
branch-25.10

Conversation

@rapids-bot

@rapids-bot rapids-bot Bot commented Sep 30, 2025

Copy link
Copy Markdown
Contributor

Forward-merge triggered by push to branch-25.10 that creates a PR to keep branch-25.12 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

This PR patches FAISS for some missing Thrust includes. This is needed to support building with CCCL 3.1.x. RAPIDS 25.10 will still use CCCL 3.0.x but we want to make it possible to build with 3.1.x in 25.10.

xref: #1329 (This backports a fix from that testing PR, which is targeting 25.12)

I am upstreaming the patch here: facebookresearch/faiss#4597

Authors:
  - Bradley Dice (https://github.com/bdice)
  - Corey J. Nolet (https://github.com/cjnolet)

Approvers:
  - Tarang Jain (https://github.com/tarang-jain)
  - Divye Gala (https://github.com/divyegala)

URL: #1398
@rapids-bot rapids-bot Bot requested a review from a team as a code owner September 30, 2025 23:58
@GPUtester GPUtester merged commit d399d3a into branch-25.12 Sep 30, 2025
2 checks passed
@rapids-bot

rapids-bot Bot commented Sep 30, 2025

Copy link
Copy Markdown
Contributor Author

SUCCESS - forward-merge complete.

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants