Skip to content

Commit

Permalink
Update recipes to GTest version >=1.13.0 (#1501)
Browse files Browse the repository at this point in the history
This PR updates GTest pinnings to >=1.13.0. This aligns with recent changes in rapids-cmake: rapidsai/rapids-cmake#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: #1501
  • Loading branch information
bdice authored May 10, 2023
1 parent 8816910 commit f60fb79
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 1 deletion.
2 changes: 2 additions & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libraft/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nccl_version:
- ">=2.9.9"

gtest_version:
- "=1.10.0"
- ">=1.13.0"

glog_version:
- ">=0.6.0"
Expand Down
4 changes: 4 additions & 0 deletions cpp/test/linalg/eig.cu
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions cpp/test/linalg/svd.cu
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
8 changes: 8 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ files:
- build_pylibraft
- cudatoolkit
- develop
- test_libraft
- docs
- run_raft_dask
- run_pylibraft
Expand All @@ -29,6 +30,7 @@ files:
output: none
includes:
- cudatoolkit
- test_libraft
test_python:
output: none
includes:
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit f60fb79

Please sign in to comment.