Skip to content

Commit e5071d6

Browse files
Always use a static gtest (#4344)
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
1 parent 5c7cb2b commit e5071d6

File tree

7 files changed

+2
-38
lines changed

7 files changed

+2
-38
lines changed

conda/environments/all_cuda-118_arch-x86_64.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ dependencies:
2525
- doxygen
2626
- fsspec>=0.6.0
2727
- gcc_linux-64=11.*
28-
- gmock>=1.13.0
2928
- graphviz
30-
- gtest>=1.13.0
3129
- ipython
3230
- libcudf==24.6.*
3331
- libcugraphops==24.6.*

conda/environments/all_cuda-122_arch-x86_64.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ dependencies:
2727
- doxygen
2828
- fsspec>=0.6.0
2929
- gcc_linux-64=11.*
30-
- gmock>=1.13.0
3130
- graphviz
32-
- gtest>=1.13.0
3331
- ipython
3432
- libcublas-dev
3533
- libcudf==24.6.*

conda/recipes/libcugraph/conda_build_config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ doxygen_version:
1919
nccl_version:
2020
- ">=2.9.9"
2121

22-
gtest_version:
23-
- ">=1.13.0"
24-
2522
sysroot_version:
2623
- "2.17"
2724

conda/recipes/libcugraph/meta.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ requirements:
6868
{% endif %}
6969
- cuda-version ={{ cuda_version }}
7070
- doxygen {{ doxygen_version }}
71-
- gmock {{ gtest_version }}
72-
- gtest {{ gtest_version }}
7371
- libcudf ={{ minor_version }}
7472
- libcugraphops ={{ minor_version }}
7573
- libraft ={{ minor_version }}
@@ -190,8 +188,6 @@ outputs:
190188
{% else %}
191189
- cuda-cudart
192190
{% endif %}
193-
- gmock {{ gtest_version }}
194-
- gtest {{ gtest_version }}
195191
about:
196192
home: https://rapids.ai/
197193
dev_url: https://github.com/rapidsai/cugraph

cpp/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ if (BUILD_CUGRAPH_MTMG_TESTS)
151151
endif()
152152

153153
if(BUILD_TESTS)
154-
include(cmake/thirdparty/get_gtest.cmake)
154+
include(${rapids-cmake-dir}/cpm/gtest.cmake)
155+
rapids_cpm_gtest(BUILD_STATIC)
155156
endif()
156157

157158
################################################################################

cpp/cmake/thirdparty/get_gtest.cmake

Lines changed: 0 additions & 24 deletions
This file was deleted.

dependencies.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,6 @@ dependencies:
354354
packages:
355355
- c-compiler
356356
- cxx-compiler
357-
- gmock>=1.13.0
358-
- gtest>=1.13.0
359357
- libcudf==24.6.*
360358
- libcugraphops==24.6.*
361359
- libraft-headers==24.6.*

0 commit comments

Comments
 (0)