Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
182 changes: 0 additions & 182 deletions cpp/cmake/patches/faiss-1.14-cuvs-25.12.diff

This file was deleted.

175 changes: 0 additions & 175 deletions cpp/cmake/patches/faiss-1.14-cuvs-26.02.diff

This file was deleted.

35 changes: 24 additions & 11 deletions cpp/cmake/patches/faiss-1.14-cuvs-26.04.diff
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
diff --git a/faiss/gpu/utils/CuvsUtils.cu b/faiss/gpu/utils/CuvsUtils.cu
Copy link
Copy Markdown
Contributor

@tarang-jain tarang-jain May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we'd probably want to rename the suffix to -cuvs-26.08.diff here for the current release.

index 1ec32179c..3751dfa62 100644
--- a/faiss/gpu/utils/CuvsUtils.cu
+++ b/faiss/gpu/utils/CuvsUtils.cu
@@ -31,6 +31,7 @@
diff --git a/faiss/gpu/impl/CuvsFlatIndex.cu b/faiss/gpu/impl/CuvsFlatIndex.cu
index d4a2d99fe..3c7e6abfa 100644
--- a/faiss/gpu/impl/CuvsFlatIndex.cu
+++ b/faiss/gpu/impl/CuvsFlatIndex.cu
@@ -30,7 +30,7 @@
#include <vector>

#include <thrust/copy.h>
#include <thrust/gather.h>
+#include <thrust/iterator/counting_iterator.h>
#include <thrust/reduce.h>

namespace faiss {
#include <cuvs/core/bitset.hpp>
-#include <cuvs/distance/distance.h>
+#include <cuvs/distance/distance.hpp>
#include <cuvs/neighbors/brute_force.hpp>
#include <raft/core/device_mdspan.hpp>
#include <raft/core/logger.hpp>
diff --git a/faiss/impl/platform_macros.h b/faiss/impl/platform_macros.h
--- a/faiss/impl/platform_macros.h
+++ b/faiss/impl/platform_macros.h
@@ -185,7 +185,7 @@
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_END
#endif
#endif
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && !defined(__NVCC__)
// Unfortunately, GCC does not provide a pragma for detecting it.
// So, we have to stick to GNUC, which is defined by MANY compilers.
// This is why clang/icc needs to be checked first.
Loading
Loading