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

Remove gtest dependency from ucxx test conda package #223

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Remove gtest dependency from ucxx test conda package #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403d5b4
Use static gtest and remove from conda package requirements
robertmaynard Apr 23, 2024
2b6fbdb
Use static gtest and remove from conda package requirements
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
2 changes: 0 additions & 2 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 @@ -22,8 +22,6 @@ dependencies:
- dask-cudf==24.6.*
- doxygen=1.9.1
- fmt>=10.1.1,<11
- gmock>=1.13.0
- gtest>=1.13.0
- librmm==24.6.*
- libtool
- ninja
Expand Down
2 changes: 0 additions & 2 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 @@ -22,8 +22,6 @@ dependencies:
- dask-cudf==24.6.*
- doxygen=1.9.1
- fmt>=10.1.1,<11
- gmock>=1.13.0
- gtest>=1.13.0
- librmm==24.6.*
- libtool
- ninja
Expand Down
4 changes: 1 addition & 3 deletions conda/recipes/ucxx/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ requirements:
- ucx
- python
- librmm =24.06
- gtest

outputs:
- name: libucxx
Expand Down Expand Up @@ -184,8 +183,7 @@ outputs:
- cuda-cudart
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- gtest
- gmock

about:
home: https://rapids.ai/
license: BSD-3-Clause
Expand Down
7 changes: 5 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =================================================================================
# SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
# SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
# SPDX-License-Identifier: BSD 3-Clause License
# =================================================================================

Expand Down Expand Up @@ -115,7 +115,10 @@ if(UCXX_ENABLE_RMM)
endif()
# find or install GoogleTest
if(BUILD_TESTS)
include(cmake/thirdparty/get_gtest.cmake)
include(${rapids-cmake-dir}/cpm/gtest.cmake)

# Find or install GoogleTest
rapids_cpm_gtest(BUILD_STATIC)
endif()

# ##################################################################################################
Expand Down
39 changes: 0 additions & 39 deletions cpp/cmake/thirdparty/get_gtest.cmake
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ dependencies:
- cxx-compiler
- &cmake_ver cmake>=3.26.4
- fmt>=10.1.1,<11
- &gmock gmock>=1.13.0
- &gtest gtest>=1.13.0
- librmm==24.6.*
- ninja
- spdlog>=1.12.0,<1.13
Expand Down Expand Up @@ -250,8 +248,6 @@ dependencies:
- output_types: conda
packages:
- *cmake_ver
- *gtest
- *gmock
test_python_ucxx:
common:
- output_types: [conda, requirements, pyproject]
Expand Down