Skip to content

Commit

Permalink
Always use a static gtest (#4344)
Browse files Browse the repository at this point in the history
Removes the need for us to install GTest in our cugraph CI containers.

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Jake Awe (https://github.com/AyodeAwe)

URL: #4344
  • Loading branch information
robertmaynard authored Apr 16, 2024
1 parent 5c7cb2b commit e5071d6
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 38 deletions.
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ dependencies:
- doxygen
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
- graphviz
- gtest>=1.13.0
- ipython
- libcudf==24.6.*
- libcugraphops==24.6.*
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ dependencies:
- doxygen
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
- graphviz
- gtest>=1.13.0
- ipython
- libcublas-dev
- libcudf==24.6.*
Expand Down
3 changes: 0 additions & 3 deletions conda/recipes/libcugraph/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ doxygen_version:
nccl_version:
- ">=2.9.9"

gtest_version:
- ">=1.13.0"

sysroot_version:
- "2.17"

Expand Down
4 changes: 0 additions & 4 deletions conda/recipes/libcugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ requirements:
{% endif %}
- cuda-version ={{ cuda_version }}
- doxygen {{ doxygen_version }}
- gmock {{ gtest_version }}
- gtest {{ gtest_version }}
- libcudf ={{ minor_version }}
- libcugraphops ={{ minor_version }}
- libraft ={{ minor_version }}
Expand Down Expand Up @@ -190,8 +188,6 @@ outputs:
{% else %}
- cuda-cudart
{% endif %}
- gmock {{ gtest_version }}
- gtest {{ gtest_version }}
about:
home: https://rapids.ai/
dev_url: https://github.com/rapidsai/cugraph
Expand Down
3 changes: 2 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ if (BUILD_CUGRAPH_MTMG_TESTS)
endif()

if(BUILD_TESTS)
include(cmake/thirdparty/get_gtest.cmake)
include(${rapids-cmake-dir}/cpm/gtest.cmake)
rapids_cpm_gtest(BUILD_STATIC)
endif()

################################################################################
Expand Down
24 changes: 0 additions & 24 deletions cpp/cmake/thirdparty/get_gtest.cmake

This file was deleted.

2 changes: 0 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,6 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- gmock>=1.13.0
- gtest>=1.13.0
- libcudf==24.6.*
- libcugraphops==24.6.*
- libraft-headers==24.6.*
Expand Down

0 comments on commit e5071d6

Please sign in to comment.