Skip to content

Commit 42269a2

Browse files
committed
Update FAISS from 1.12.0 to 1.13.0
Remove thrust include patches that are already in upstream FAISS 1.13.0. All other RMM API compatibility patches still apply cleanly. Related to #1566
1 parent 9b371e4 commit 42269a2

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

cpp/cmake/patches/faiss-25.12.diff renamed to cpp/cmake/patches/faiss-1.13-cuvs-25.12.diff

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -120,34 +120,6 @@ index f23ca19d8..3ba606606 100644
120120
#endif
121121

122122
/// Pinned memory allocation for use with this GPU
123-
diff --git a/faiss/gpu/impl/BinaryCuvsCagra.cu b/faiss/gpu/impl/BinaryCuvsCagra.cu
124-
index 0ca21dc5f..b331fdc8f 100644
125-
--- a/faiss/gpu/impl/BinaryCuvsCagra.cu
126-
+++ b/faiss/gpu/impl/BinaryCuvsCagra.cu
127-
@@ -32,6 +32,9 @@
128-
#include <raft/core/resource/thrust_policy.hpp>
129-
#include <raft/linalg/map.cuh>
130-
131-
+#include <thrust/copy.h>
132-
+#include <thrust/device_ptr.h>
133-
+
134-
namespace faiss {
135-
namespace gpu {
136-
137-
diff --git a/faiss/gpu/impl/CuvsCagra.cu b/faiss/gpu/impl/CuvsCagra.cu
138-
index 482e4d672..4246776e8 100644
139-
--- a/faiss/gpu/impl/CuvsCagra.cu
140-
+++ b/faiss/gpu/impl/CuvsCagra.cu
141-
@@ -31,6 +31,9 @@
142-
#include <raft/core/device_resources.hpp>
143-
#include <raft/core/resource/thrust_policy.hpp>
144-
145-
+#include <thrust/copy.h>
146-
+#include <thrust/device_ptr.h>
147-
+
148-
namespace faiss {
149-
namespace gpu {
150-
151123
diff --git a/faiss/gpu/impl/CuvsFlatIndex.cu b/faiss/gpu/impl/CuvsFlatIndex.cu
152124
index 15cf427cf..d877e766d 100644
153125
--- a/faiss/gpu/impl/CuvsFlatIndex.cu

cpp/cmake/patches/faiss_override.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"packages" : {
33
"faiss" : {
4-
"version": "1.12.0",
4+
"version": "1.13.0",
55
"git_url": "https://github.com/facebookresearch/faiss.git",
6-
"git_tag": "v1.12.0",
6+
"git_tag": "v1.13.0",
77
"patches" : [
88
{
9-
"file" : "${current_json_dir}/faiss-25.12.diff",
9+
"file" : "${current_json_dir}/faiss-1.13-cuvs-25.12.diff",
1010
"issue" : "Multiple fixes for cuVS and RMM compatibility",
1111
"fixed_in" : ""
1212
}

0 commit comments

Comments
 (0)