Skip to content

Commit a18d413

Browse files
authored
FAISS patch for removed raft headers (rapidsai#1654)
Removes unused raft headers from faiss which have now been removed from raft altogether. xref: rapidsai/raft#2885 Authors: - Anupam (https://github.com/aamijar) Approvers: - Bradley Dice (https://github.com/bdice) - Micka (https://github.com/lowener) URL: rapidsai#1654
1 parent a3adce5 commit a18d413

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/faiss/gpu/GpuDistance.cu b/faiss/gpu/GpuDistance.cu
2+
index c82c73e7d..65ed8a1d4 100644
3+
--- a/faiss/gpu/GpuDistance.cu
4+
+++ b/faiss/gpu/GpuDistance.cu
5+
@@ -43,7 +43,6 @@
6+
#include <raft/core/operators.hpp>
7+
#include <raft/core/temporary_device_buffer.hpp>
8+
#include <raft/linalg/unary_op.cuh>
9+
-#include <raft/neighbors/brute_force.cuh>
10+
#endif
11+
12+
namespace faiss {
13+
diff --git a/faiss/gpu/impl/CuvsFlatIndex.cu b/faiss/gpu/impl/CuvsFlatIndex.cu
14+
index 15cf427cf..efc66ea94 100644
15+
--- a/faiss/gpu/impl/CuvsFlatIndex.cu
16+
+++ b/faiss/gpu/impl/CuvsFlatIndex.cu
17+
@@ -31,7 +31,6 @@
18+
#include <cuvs/neighbors/brute_force.hpp>
19+
#include <raft/core/device_mdspan.hpp>
20+
#include <raft/core/logger.hpp>
21+
-#include <raft/distance/distance_types.hpp>
22+
#include <raft/linalg/unary_op.cuh>
23+
24+
namespace faiss {

cpp/cmake/patches/faiss_override.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"file" : "${current_json_dir}/faiss-1.13-cuvs-25.12.diff",
1010
"issue" : "Multiple fixes for cuVS and RMM compatibility",
1111
"fixed_in" : ""
12+
},
13+
{
14+
"file" : "${current_json_dir}/faiss-1.13-cuvs-26.02.diff",
15+
"issue" : "Multiple fixes for RAFT compatibility",
16+
"fixed_in" : ""
1217
}
1318
]
1419
}

0 commit comments

Comments
 (0)