Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove public gtest dependency from libcudf conda package #15534

Merged
merged 9 commits into from
Apr 23, 2024
Merged

Remove public gtest dependency from libcudf conda package #15534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d2a9a7
Use static gtest and gbench everywhere
robertmaynard Apr 15, 2024
475a585
Correct style issues found by CI
robertmaynard Apr 15, 2024
0aff0ec
Merge branch 'branch-24.06' into fea/static_test_dependencies
bdice Apr 16, 2024
976815e
Refactor cudftestutil to not have a public gtest dependency
robertmaynard Apr 18, 2024
2530c68
Remove gtest dependency from cudftestutil
robertmaynard Apr 19, 2024
0e45394
Update copyright year
robertmaynard Apr 19, 2024
2ca5600
Merge branch 'branch-24.06' into fea/static_test_dependencies
vyasr Apr 19, 2024
2a142a2
Merge branch 'branch-24.06' into fea/static_test_dependencies
robertmaynard Apr 22, 2024
d7058f8
Remove unneeded hacks for GTest < 1.11
robertmaynard Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ channels:
- nvidia
dependencies:
- aiobotocore>=2.2.0
- benchmark==1.8.0
- boto3>=1.21.21
- botocore>=1.24.21
- breathe>=4.35.0
Expand All @@ -34,8 +33,6 @@ dependencies:
- fmt>=10.1.1,<11
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
- gtest>=1.13.0
- hypothesis
- identify>=2.5.20
- ipython
Expand Down
3 changes: 0 additions & 3 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ channels:
- nvidia
dependencies:
- aiobotocore>=2.2.0
- benchmark==1.8.0
- boto3>=1.21.21
- botocore>=1.24.21
- breathe>=4.35.0
Expand All @@ -35,8 +34,6 @@ dependencies:
- fmt>=10.1.1,<11
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
- gtest>=1.13.0
- hypothesis
- identify>=2.5.20
- ipython
Expand Down
6 changes: 0 additions & 6 deletions conda/recipes/libcudf/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ sysroot_version:
cmake_version:
- ">=3.26.4"

gbench_version:
- "==1.8.0"

gtest_version:
- ">=1.13.0"

libarrow_version:
- "==14.0.2"

Expand Down
11 changes: 0 additions & 11 deletions conda/recipes/libcudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ requirements:
- librdkafka {{ librdkafka_version }}
- fmt {{ fmt_version }}
- spdlog {{ spdlog_version }}
- benchmark {{ gbench_version }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
- zlib {{ zlib_version }}

outputs:
Expand Down Expand Up @@ -108,8 +105,6 @@ outputs:
- librmm ={{ minor_version }}
- libkvikio ={{ minor_version }}
- dlpack {{ dlpack_version }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
test:
commands:
- test -f $PREFIX/lib/libcudf.so
Expand Down Expand Up @@ -221,9 +216,6 @@ outputs:
{% else %}
- libcurand-dev
{% endif %}
- benchmark {{ gbench_version }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
run:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- {{ pin_subpackage('libcudf', exact=True) }}
Expand All @@ -233,9 +225,6 @@ outputs:
{% else %}
- libcurand
{% endif %}
- benchmark {{ gbench_version }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
about:
home: https://rapids.ai/
license: Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ endif()
if(CUDF_BUILD_BENCHMARKS)
# Find or install GoogleBench
include(${rapids-cmake-dir}/cpm/gbench.cmake)
rapids_cpm_gbench()
rapids_cpm_gbench(BUILD_STATIC)

# Find or install nvbench
include(cmake/thirdparty/get_nvbench.cmake)
Expand Down
6 changes: 4 additions & 2 deletions cpp/cmake/thirdparty/get_gtest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2021-2023, NVIDIA CORPORATION.
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand All @@ -17,7 +17,9 @@ function(find_and_configure_gtest)
include(${rapids-cmake-dir}/cpm/gtest.cmake)

# Find or install GoogleTest
rapids_cpm_gtest(BUILD_EXPORT_SET cudf-testing-exports INSTALL_EXPORT_SET cudf-testing-exports)
rapids_cpm_gtest(
BUILD_EXPORT_SET cudf-testing-exports INSTALL_EXPORT_SET cudf-testing-exports BUILD_STATIC
)

if(GTest_ADDED)
rapids_export(
Expand Down
6 changes: 0 additions & 6 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,6 @@ dependencies:
- output_types: conda
packages:
- fmt>=10.1.1,<11
- &gbench benchmark==1.8.0
- &gtest gtest>=1.13.0
- &gmock gmock>=1.13.0
- librmm==24.6.*
- libkvikio==24.6.*
- librdkafka>=1.9.0,<1.10.0a0
Expand Down Expand Up @@ -590,9 +587,6 @@ dependencies:
- output_types: conda
packages:
- *cmake_ver
- *gbench
- *gtest
- *gmock
specific:
- output_types: conda
matrices:
Expand Down
Loading