From a4c21d7564f3fb652e81111c99d3f0b894954a77 Mon Sep 17 00:00:00 2001
From: Rong Ou <rong.ou@gmail.com>
Date: Mon, 24 May 2021 08:45:30 -0700
Subject: [PATCH] upgrade spdlog to 1.8.5 (#658)

The new version includes `fmt` version 7.1.3 which fixed the problem with cuda 10.x.

@harrism @kkraus14

Authors:
  - Rong Ou (https://github.com/rongou)

Approvers:
  - Keith Kraus (https://github.com/kkraus14)
  - Mark Harris (https://github.com/harrism)
  - Mike Wendt (https://github.com/mike-wendt)
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: https://github.com/rapidsai/rmm/pull/658
---
 ci/gpu/build.sh                         | 2 +-
 cmake/Modules/RMM_thirdparty.cmake      | 2 +-
 conda/environments/rmm_dev_cuda10.1.yml | 2 +-
 conda/environments/rmm_dev_cuda10.2.yml | 2 +-
 conda/environments/rmm_dev_cuda11.0.yml | 2 +-
 conda/recipes/librmm/meta.yaml          | 2 +-
 conda/recipes/rmm/meta.yaml             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
index d0ad9ba2d..54ff1e8c1 100755
--- a/ci/gpu/build.sh
+++ b/ci/gpu/build.sh
@@ -42,7 +42,7 @@ conda activate rapids
 gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.*
 
 # https://docs.rapids.ai/maintainers/depmgmt/ 
-# conda remove -f rapids-build-env
+# conda remove --force rapids-build-env
 # gpuci_conda_retry install "your-pkg=1.0.0"
 
 gpuci_logger "Check versions"
diff --git a/cmake/Modules/RMM_thirdparty.cmake b/cmake/Modules/RMM_thirdparty.cmake
index 113a39860..f1186335c 100644
--- a/cmake/Modules/RMM_thirdparty.cmake
+++ b/cmake/Modules/RMM_thirdparty.cmake
@@ -1,6 +1,6 @@
 # spdlog
 
-set(RMM_MIN_VERSION_spdlog 1.7.0)
+set(RMM_MIN_VERSION_spdlog 1.8.5)
 
 if(NOT TARGET spdlog)
   CPMFindPackage(
diff --git a/conda/environments/rmm_dev_cuda10.1.yml b/conda/environments/rmm_dev_cuda10.1.yml
index be0bbbccf..455fa7239 100644
--- a/conda/environments/rmm_dev_cuda10.1.yml
+++ b/conda/environments/rmm_dev_cuda10.1.yml
@@ -16,5 +16,5 @@ dependencies:
 - cffi>=1.10.0
 - pytest
 - cudatoolkit=10.1
-- spdlog=1.7.0
+- spdlog>=1.8.5,<2.0.0a0
 - cython>=0.29,<0.30
diff --git a/conda/environments/rmm_dev_cuda10.2.yml b/conda/environments/rmm_dev_cuda10.2.yml
index 42c5e3273..916892680 100644
--- a/conda/environments/rmm_dev_cuda10.2.yml
+++ b/conda/environments/rmm_dev_cuda10.2.yml
@@ -16,5 +16,5 @@ dependencies:
 - cffi>=1.10.0
 - pytest
 - cudatoolkit=10.2
-- spdlog=1.7.0
+- spdlog>=1.8.5,<2.0.0a0
 - cython>=0.29,<0.30
diff --git a/conda/environments/rmm_dev_cuda11.0.yml b/conda/environments/rmm_dev_cuda11.0.yml
index 8a37c5b96..f3e174d5d 100644
--- a/conda/environments/rmm_dev_cuda11.0.yml
+++ b/conda/environments/rmm_dev_cuda11.0.yml
@@ -16,5 +16,5 @@ dependencies:
 - cffi>=1.10.0
 - pytest
 - cudatoolkit=11.0
-- spdlog=1.7.0
+- spdlog>=1.8.5,<2.0.0a0
 - cython>=0.29,<0.30
diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml
index f6b0ea204..0e7a5d1eb 100644
--- a/conda/recipes/librmm/meta.yaml
+++ b/conda/recipes/librmm/meta.yaml
@@ -35,7 +35,7 @@ requirements:
     - cudatoolkit {{ cuda_version }}.*
   run:
     - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
-    - spdlog=1.7.0
+    - spdlog>=1.8.5,<2.0.0a0
 
 test:
   commands:
diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml
index 91ca29102..eeacc21de 100644
--- a/conda/recipes/rmm/meta.yaml
+++ b/conda/recipes/rmm/meta.yaml
@@ -27,7 +27,7 @@ requirements:
     - librmm {{ version }}
     - setuptools
     - cython >=0.29,<0.30
-    - spdlog=1.7.0
+    - spdlog>=1.8.5,<2.0.0a0
     - cudatoolkit {{ cuda_version }}.*
   run:
     - python