From f60fb79f2dc3c6944a36cb14142ae3823ebcc33d Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Tue, 9 May 2023 20:33:54 -0500
Subject: [PATCH] Update recipes to GTest version >=1.13.0 (#1501)

This PR updates GTest pinnings to >=1.13.0. This aligns with recent changes in rapids-cmake: https://github.com/rapidsai/rapids-cmake/pull/401.

Authors:
  - Bradley Dice (https://github.com/bdice)
  - Divye Gala (https://github.com/divyegala)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Corey J. Nolet (https://github.com/cjnolet)

URL: https://github.com/rapidsai/raft/pull/1501
---
 conda/environments/all_cuda-118_arch-x86_64.yaml | 2 ++
 conda/recipes/libraft/conda_build_config.yaml    | 2 +-
 cpp/test/linalg/eig.cu                           | 4 ++++
 cpp/test/linalg/svd.cu                           | 4 ++++
 dependencies.yaml                                | 8 ++++++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 52256b4266..aae2aa3d15 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -24,7 +24,9 @@ dependencies:
 - distributed==2023.3.2.1
 - doxygen>=1.8.20
 - gcc_linux-64=11.*
+- gmock>=1.13.0
 - graphviz
+- gtest>=1.13.0
 - ipython
 - joblib>=0.11
 - libcublas-dev=11.11.3.6
diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml
index 2a66f213a7..bec773d26d 100644
--- a/conda/recipes/libraft/conda_build_config.yaml
+++ b/conda/recipes/libraft/conda_build_config.yaml
@@ -17,7 +17,7 @@ nccl_version:
   - ">=2.9.9"
 
 gtest_version:
-  - "=1.10.0"
+  - ">=1.13.0"
 
 glog_version:
   - ">=0.6.0"
diff --git a/cpp/test/linalg/eig.cu b/cpp/test/linalg/eig.cu
index 5229e99d20..99d6cd0a31 100644
--- a/cpp/test/linalg/eig.cu
+++ b/cpp/test/linalg/eig.cu
@@ -273,5 +273,9 @@ INSTANTIATE_TEST_SUITE_P(EigTests, EigTestVecJacobiF, ::testing::ValuesIn(inputs
 
 INSTANTIATE_TEST_SUITE_P(EigTests, EigTestVecJacobiD, ::testing::ValuesIn(inputsd2));
 
+INSTANTIATE_TEST_SUITE_P(EigTests, EigTestVecCompareF, ::testing::ValuesIn(inputsf2));
+
+INSTANTIATE_TEST_SUITE_P(EigTests, EigTestVecCompareD, ::testing::ValuesIn(inputsd2));
+
 }  // namespace linalg
 }  // namespace raft
diff --git a/cpp/test/linalg/svd.cu b/cpp/test/linalg/svd.cu
index bd66459962..c780476a5f 100644
--- a/cpp/test/linalg/svd.cu
+++ b/cpp/test/linalg/svd.cu
@@ -202,6 +202,10 @@ INSTANTIATE_TEST_SUITE_P(SvdTests, SvdTestLeftVecF, ::testing::ValuesIn(inputsf2
 
 INSTANTIATE_TEST_SUITE_P(SvdTests, SvdTestLeftVecD, ::testing::ValuesIn(inputsd2));
 
+INSTANTIATE_TEST_SUITE_P(SvdTests, SvdTestRightVecF, ::testing::ValuesIn(inputsf2));
+
+INSTANTIATE_TEST_SUITE_P(SvdTests, SvdTestRightVecD, ::testing::ValuesIn(inputsd2));
+
 // INSTANTIATE_TEST_SUITE_P(SvdTests, SvdTestRightVecF,
 // ::testing::ValuesIn(inputsf2));
 
diff --git a/dependencies.yaml b/dependencies.yaml
index af747951d8..ccaf3fe0d8 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -10,6 +10,7 @@ files:
       - build_pylibraft
       - cudatoolkit
       - develop
+      - test_libraft
       - docs
       - run_raft_dask
       - run_pylibraft
@@ -29,6 +30,7 @@ files:
     output: none
     includes:
       - cudatoolkit
+      - test_libraft
   test_python:
     output: none
     includes:
@@ -216,6 +218,12 @@ dependencies:
               - *libcusolver114
               - *libcusparse_dev114
               - *libcusparse114
+  test_libraft:
+    common:
+      - output_types: [conda]
+        packages:
+          - gtest>=1.13.0
+          - gmock>=1.13.0
   docs:
     common:
       - output_types: [conda]