Skip to content

Update FAISS patch for RMM memory resource header migration #1566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 2 commits into from
Nov 19, 2025
Merged

Update FAISS patch for RMM memory resource header migration #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e426bc7
Update FAISS patch for RMM memory resource header migration
bdice Nov 18, 2025
225d366
Fix ACE example usage of RMM
bdice Nov 19, 2025
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
30 changes: 23 additions & 7 deletions cpp/cmake/patches/faiss.diff → cpp/cmake/patches/faiss-25.12.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,33 @@ index c82c73e7d..b9100c272 100644

auto resImpl = prov->getResources();
auto res = resImpl.get();
diff --git a/faiss/gpu/GpuResources.h b/faiss/gpu/GpuResources.h
index c0c851a89..61d9d4dbe 100644
--- a/faiss/gpu/GpuResources.h
+++ b/faiss/gpu/GpuResources.h
@@ -33,7 +33,7 @@

#if defined USE_NVIDIA_CUVS
#include <raft/core/device_resources.hpp>
-#include <rmm/mr/device/device_memory_resource.hpp>
+#include <rmm/mr/device_memory_resource.hpp>
#endif

namespace faiss {
diff --git a/faiss/gpu/StandardGpuResources.cpp b/faiss/gpu/StandardGpuResources.cpp
index 649b7cb5c..765fdb3d0 100644
index 649b7cb5c..622443044 100644
--- a/faiss/gpu/StandardGpuResources.cpp
+++ b/faiss/gpu/StandardGpuResources.cpp
@@ -24,8 +24,8 @@
@@ -23,9 +23,9 @@

#if defined USE_NVIDIA_CUVS
#include <raft/core/device_resources.hpp>
#include <rmm/mr/device/managed_memory_resource.hpp>
+#include <rmm/mr/pinned_host_memory_resource.hpp>
#include <rmm/mr/device/per_device_resource.hpp>
-#include <rmm/mr/device/managed_memory_resource.hpp>
-#include <rmm/mr/device/per_device_resource.hpp>
-#include <rmm/mr/host/pinned_memory_resource.hpp>
+#include <rmm/mr/managed_memory_resource.hpp>
+#include <rmm/mr/per_device_resource.hpp>
+#include <rmm/mr/pinned_host_memory_resource.hpp>
#include <memory>
#endif

Expand Down Expand Up @@ -80,15 +96,15 @@ index 649b7cb5c..765fdb3d0 100644
auto err = cudaFree(p);
FAISS_ASSERT_FMT(
diff --git a/faiss/gpu/StandardGpuResources.h b/faiss/gpu/StandardGpuResources.h
index f23ca19d8..c43926fce 100644
index f23ca19d8..3ba606606 100644
--- a/faiss/gpu/StandardGpuResources.h
+++ b/faiss/gpu/StandardGpuResources.h
@@ -25,7 +25,8 @@

#if defined USE_NVIDIA_CUVS
#include <raft/core/device_resources.hpp>
-#include <rmm/mr/host/pinned_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
+#include <rmm/mr/device_memory_resource.hpp>
+#include <rmm/mr/pinned_host_memory_resource.hpp>
#endif

Expand Down
4 changes: 2 additions & 2 deletions cpp/cmake/patches/faiss_override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"git_tag": "v1.12.0",
Copy link
Copy Markdown
Contributor

@tarang-jain tarang-jain Nov 19, 2025

Choose a reason for hiding this comment

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

Actually they just released v1.13.0. Can we tag that one?

Copy link
Copy Markdown
Contributor Author

@bdice bdice Nov 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Discussed offline. We're going to merge this as-is to get main unblocked, then tackle 1.13 in a follow-up PR.

"patches" : [
{
"file" : "${current_json_dir}/faiss.diff",
"issue" : "Multiple fixes for cuVS compatibility",
"file" : "${current_json_dir}/faiss-25.12.diff",
"issue" : "Multiple fixes for cuVS and RMM compatibility",
"fixed_in" : ""
}
]
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/src/cagra_hnsw_ace_example.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include <cuvs/neighbors/cagra.hpp>
#include <cuvs/neighbors/hnsw.hpp>

#include <rmm/mr/device/device_memory_resource.hpp>
#include <rmm/mr/device/pool_memory_resource.hpp>
#include <rmm/mr/device_memory_resource.hpp>
#include <rmm/mr/pool_memory_resource.hpp>

#include "common.cuh"

Expand Down