From 3f8a8b2d447d820024ae002d9a2359ce2a37340d Mon Sep 17 00:00:00 2001
From: "Corey J. Nolet" <cjnolet@gmail.com>
Date: Tue, 21 Nov 2023 19:31:43 +0100
Subject: [PATCH] Pinning fmt and spdlog for raft-ann-bench-cpu (#2018)

We were relying on spdlog/fmt to be brought in transitively before, which was compatible with FAISS. It looks like they are no longer being brought in transitively and so we are bringing in a newer version at the cpm/cmake level which is breaking our raft-ann-bench-cpu build.

Authors:
  - Corey J. Nolet (https://github.com/cjnolet)

Approvers:
  - Divye Gala (https://github.com/divyegala)
  - Jake Awe (https://github.com/AyodeAwe)

URL: https://github.com/rapidsai/raft/pull/2018
---
 conda/recipes/libraft/conda_build_config.yaml            | 6 ++++++
 conda/recipes/libraft/meta.yaml                          | 4 ++++
 conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml | 6 ++++++
 conda/recipes/raft-ann-bench-cpu/meta.yaml               | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml
index d156f2609b..25493a34fa 100644
--- a/conda/recipes/libraft/conda_build_config.yaml
+++ b/conda/recipes/libraft/conda_build_config.yaml
@@ -71,3 +71,9 @@ cuda11_cuda_profiler_api_host_version:
 
 cuda11_cuda_profiler_api_run_version:
   - ">=11.4.240,<12"
+
+spdlog_version:
+  - ">=1.11.0,<1.12"
+
+fmt_version:
+  - ">=9.1.0,<10"
diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml
index 5203f7b3bd..116f8d9e6e 100644
--- a/conda/recipes/libraft/meta.yaml
+++ b/conda/recipes/libraft/meta.yaml
@@ -63,12 +63,16 @@ outputs:
         {% endif %}
         - cuda-version ={{ cuda_version }}
         - librmm ={{ minor_version }}
+        - spdlog {{ spdlog_version }}
+        - fmt {{ fmt_version }}
       run:
         - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
         {% if cuda_major == "11" %}
         - cudatoolkit
         {% endif %}
         - librmm ={{ minor_version }}
+        - spdlog {{ spdlog_version }}
+        - fmt {{ fmt_version }}
     about:
       home: https://rapids.ai/
       license: Apache-2.0
diff --git a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml
index 0bd424f85b..fda3e4e53d 100644
--- a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml
+++ b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml
@@ -18,3 +18,9 @@ h5py_version:
 
 nlohmann_json_version:
   - ">=3.11.2"
+
+spdlog_version:
+  - ">=1.11.0,<1.12"
+
+fmt_version:
+  - ">=9.1.0,<10"
diff --git a/conda/recipes/raft-ann-bench-cpu/meta.yaml b/conda/recipes/raft-ann-bench-cpu/meta.yaml
index 6db9400d97..fce85d5ffc 100644
--- a/conda/recipes/raft-ann-bench-cpu/meta.yaml
+++ b/conda/recipes/raft-ann-bench-cpu/meta.yaml
@@ -48,6 +48,8 @@ requirements:
     - glog {{ glog_version }}
     - matplotlib
     - nlohmann_json {{ nlohmann_json_version }}
+    - spdlog {{ spdlog_version }}
+    - fmt {{ fmt_version }}
     - python
     - pyyaml
     - pandas