From 6bcf3b6691af0f3351b07c63afb9f411e9be351c Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Mon, 20 Mar 2023 11:19:11 -0500
Subject: [PATCH 1/2] Add libfaiss runtime dependency to libcuml.

---
 conda/recipes/libcuml/meta.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conda/recipes/libcuml/meta.yaml b/conda/recipes/libcuml/meta.yaml
index a6c43f9646..3417d76ed0 100644
--- a/conda/recipes/libcuml/meta.yaml
+++ b/conda/recipes/libcuml/meta.yaml
@@ -88,6 +88,8 @@ outputs:
         - libraft-headers ={{ minor_version }}
         - libraft-nn ={{ minor_version }}
         - treelite {{ treelite_version }}
+        - libfaiss>=1.7.1
+        - faiss-proc=*=cuda
     about:
       home: https://rapids.ai/
       license: Apache-2.0

From 2065ffcb486277448427ddc483566706384e8392 Mon Sep 17 00:00:00 2001
From: "Corey J. Nolet" <cjnolet@gmail.com>
Date: Mon, 20 Mar 2023 12:51:31 -0400
Subject: [PATCH 2/2] Making FAISS a private dependency

---
 cpp/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index cc687dcedc..34b5e98b30 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -585,6 +585,8 @@ if(BUILD_CUML_CPP_LIBRARY)
 
   # These are always private:
   list(APPEND _cuml_cpp_private_libs
+    raft::raft
+    $<$<BOOL:${CUML_USE_RAFT_NN}>:faiss>
     $<TARGET_NAME_IF_EXISTS:GPUTreeShap::GPUTreeShap>
     $<$<BOOL:${LINK_CUFFT}>:CUDA::cufft${_ctk_static_suffix}>
     ${TREELITE_LIBS}
@@ -604,8 +606,6 @@ if(BUILD_CUML_CPP_LIBRARY)
   # because cumlprims_mg and cuML inherit their CUDA libs from the raft::raft
   # INTERFACE target.
   list(APPEND ${_cuml_cpp_libs_var_name}
-    raft::raft
-          $<$<BOOL:${CUML_USE_RAFT_NN}>:faiss>
     $<$<BOOL:${CUML_USE_RAFT_NN}>:raft::nn>
     $<$<BOOL:${CUML_USE_RAFT_DIST}>:raft::distance>
     $<TARGET_NAME_IF_EXISTS:cumlprims_mg::cumlprims_mg>