Merge pull request #1401 from rapidsai/branch-25.10

Forward-merge branch-25.10 into branch-25.12

Author: GPUtester

cpp/cmake/patches/faiss/fix-missing-includes-for-thrust-copy.patch

@@ -0,0 +1,40 @@
+From 87c5331dfa6ec30fd9839ecb89af519e65f010e7 Mon Sep 17 00:00:00 2001
+From: Bradley Dice <bdice@bradleydice.com>
+Date: Mon, 29 Sep 2025 15:39:17 -0500
+Subject: [PATCH] Fix missing includes for thrust::copy
+
+---
+ faiss/gpu/impl/BinaryCuvsCagra.cu | 3 +++
+ faiss/gpu/impl/CuvsCagra.cu       | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/faiss/gpu/impl/BinaryCuvsCagra.cu b/faiss/gpu/impl/BinaryCuvsCagra.cu
+index 0ca21dc5f..b331fdc8f 100644
+--- a/faiss/gpu/impl/BinaryCuvsCagra.cu
++++ b/faiss/gpu/impl/BinaryCuvsCagra.cu
+@@ -32,6 +32,9 @@
+ #include <raft/core/resource/thrust_policy.hpp>
+ #include <raft/linalg/map.cuh>
+
++#include <thrust/copy.h>
++#include <thrust/device_ptr.h>
++
+ namespace faiss {
+ namespace gpu {
+
+diff --git a/faiss/gpu/impl/CuvsCagra.cu b/faiss/gpu/impl/CuvsCagra.cu
+index 9ac4e1c5a..755817f43 100644
+--- a/faiss/gpu/impl/CuvsCagra.cu
++++ b/faiss/gpu/impl/CuvsCagra.cu
+@@ -31,6 +31,9 @@
+ #include <raft/core/device_resources.hpp>
+ #include <raft/core/resource/thrust_policy.hpp>
+
++#include <thrust/copy.h>
++#include <thrust/device_ptr.h>
++
+ namespace faiss {
+ namespace gpu {
+
+--
+2.49.0

cpp/cmake/patches/faiss_override.json

@@ -1,9 +1,16 @@
 {
-    "packages" : {
-      "faiss" : {
-        "version": "1.12.0",
-        "git_url": "https://github.com/facebookresearch/faiss.git",
-        "git_tag": "v1.12.0"
-      }
+  "packages" : {
+    "faiss" : {
+      "version": "1.12.0",
+      "git_url": "https://github.com/facebookresearch/faiss.git",
+      "git_tag": "v1.12.0",
+      "patches" : [
+        {
+          "file" : "${current_json_dir}/faiss/fix-missing-includes-for-thrust-copy.patch",
+          "issue" : "Fix missing Thrust includes. https://github.com/facebookresearch/faiss/pull/4597",
+          "fixed_in" : ""
+        }
+      ]
     }
   }
+}