From 4c1d67120cfbd18cb1e9f1b2f9d2a0395b8df8e1 Mon Sep 17 00:00:00 2001
From: Victor Lafargue <viclafargue@nvidia.com>
Date: Tue, 8 Mar 2022 14:48:14 +0100
Subject: [PATCH] Use FAISS with RMM (#4297)

Answers #2821

Authors:
  - Victor Lafargue (https://github.com/viclafargue)

Approvers:
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: https://github.com/rapidsai/cuml/pull/4297
---
 cpp/src/hdbscan/detail/reachability_faiss.cuh | 4 ++--
 cpp/src_prims/selection/knn.cuh               | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cpp/src/hdbscan/detail/reachability_faiss.cuh b/cpp/src/hdbscan/detail/reachability_faiss.cuh
index a4131a3308..804c8b500d 100644
--- a/cpp/src/hdbscan/detail/reachability_faiss.cuh
+++ b/cpp/src/hdbscan/detail/reachability_faiss.cuh
@@ -24,7 +24,6 @@
 #pragma once
 
 #include <faiss/gpu/GpuResources.h>
-#include <faiss/gpu/StandardGpuResources.h>
 
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissException.h>
@@ -41,6 +40,7 @@
 
 #include <raft/cuda_utils.cuh>
 #include <raft/handle.hpp>
+#include <raft/spatial/knn/faiss_mr.hpp>
 
 #include <rmm/device_uvector.hpp>
 
@@ -212,7 +212,7 @@ void mutual_reachability_knn_l2(const raft::handle_t& handle,
   auto stream = handle.get_stream();
 
   faiss::gpu::DeviceScope ds(device);
-  faiss::gpu::StandardGpuResources res;
+  raft::spatial::knn::RmmGpuResources res;
 
   res.noTempMemory();
   res.setDefaultStream(device, stream);
diff --git a/cpp/src_prims/selection/knn.cuh b/cpp/src_prims/selection/knn.cuh
index bdba95d082..03fb6d83c3 100644
--- a/cpp/src_prims/selection/knn.cuh
+++ b/cpp/src_prims/selection/knn.cuh
@@ -35,7 +35,6 @@
 #include <faiss/gpu/GpuIndexIVFPQ.h>
 #include <faiss/gpu/GpuIndexIVFScalarQuantizer.h>
 #include <faiss/gpu/GpuResources.h>
-#include <faiss/gpu/StandardGpuResources.h>
 #include <faiss/gpu/utils/Limits.cuh>
 #include <faiss/gpu/utils/Select.cuh>
 #include <faiss/gpu/utils/Tensor.cuh>