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

Always use a static gtest and gbench #1377

Merged
merged 2 commits into from
Apr 26, 2024
Merged

Always use a static gtest and gbench #1377

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
aed3500
Always use a static gtest and gbench
trxcllnt Apr 25, 2024
d645b63
fix lint
trxcllnt Apr 25, 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 @@ -20,8 +20,6 @@ dependencies:
- doxygen
- gcc_linux-64=11.*
- geopandas>=0.11.0
- gmock>=1.13.0
- gtest>=1.13.0
- ipython
- ipywidgets
- libcudf==24.6.*
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 @@ -23,8 +23,6 @@ dependencies:
- doxygen
- gcc_linux-64=11.*
- geopandas>=0.11.0
- gmock>=1.13.0
- gtest>=1.13.0
- ipython
- ipywidgets
- libcudf==24.6.*
Expand Down
6 changes: 1 addition & 5 deletions conda/recipes/libcuspatial/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Copyright (c) 2018-2024, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
Expand Down Expand Up @@ -46,8 +46,6 @@ requirements:
host:
- cuda-version ={{ cuda_version }}
- doxygen
- gmock {{ gtest_version }}
- gtest {{ gtest_version }}
- libcudf ={{ minor_version }}
- librmm ={{ minor_version }}
- sqlite
Expand Down Expand Up @@ -129,5 +127,3 @@ outputs:
- cuda-cudart
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- gmock {{ gtest_version }}
- gtest {{ gtest_version }}
5 changes: 3 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ rapids_cpm_init()
include(cmake/thirdparty/get_cudf.cmake)
# find or install GoogleTest
if (CUSPATIAL_BUILD_TESTS)
include(cmake/thirdparty/get_gtest.cmake)
include(${rapids-cmake-dir}/cpm/gtest.cmake)
rapids_cpm_gtest(BUILD_STATIC)
endif()
# find or add ranger
include (cmake/thirdparty/get_ranger.cmake)
Expand Down Expand Up @@ -222,7 +223,7 @@ endif()
if(CUSPATIAL_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 Temporarily force downloading of fmt because current versions of nvbench
# do not support the latest version of fmt, which is automatically pulled into our conda
Expand Down
39 changes: 0 additions & 39 deletions cpp/cmake/thirdparty/get_gtest.cmake
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions cpp/cuproj/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ include(cmake/thirdparty/get_rmm.cmake)

# find or install GoogleTest and Proj
if (CUPROJ_BUILD_TESTS)
include(cmake/thirdparty/get_gtest.cmake)
include(cmake/thirdparty/get_proj.cmake)
include(${rapids-cmake-dir}/cpm/gtest.cmake)
rapids_cpm_gtest(BUILD_STATIC)
include(cmake/thirdparty/get_proj.cmake)
endif()

###################################################################################################
Expand Down Expand Up @@ -162,7 +163,7 @@ endif()
if(CUPROJ_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 Temporarily force downloading of fmt because current versions of nvbench
# do not support the latest version of fmt, which is automatically pulled into our conda
Expand Down
39 changes: 0 additions & 39 deletions cpp/cuproj/cmake/thirdparty/get_gtest.cmake
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions cpp/tests/bounding_boxes/linestring_bounding_boxes_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <cudf/table/table_view.hpp>
#include <cudf_test/column_wrapper.hpp>

#include <gtest/gtest.h>

struct LinestringBoundingBoxErrorTest : public ::testing::Test {};

using T = float;
Expand Down
2 changes: 2 additions & 0 deletions cpp/tests/bounding_boxes/polygon_bounding_boxes_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <cudf_test/column_utilities.hpp>
#include <cudf_test/column_wrapper.hpp>

#include <gtest/gtest.h>

struct PolygonBoundingBoxErrorTest : public ::testing::Test {};

using T = float;
Expand Down
2 changes: 2 additions & 0 deletions cpp/tests/join/quadtree_point_in_polygon_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <cudf_test/column_wrapper.hpp>
#include <cudf_test/table_utilities.hpp>

#include <gtest/gtest.h>

#include <memory>

using T = float;
Expand Down
2 changes: 2 additions & 0 deletions cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <cudf_test/column_wrapper.hpp>
#include <cudf_test/table_utilities.hpp>

#include <gtest/gtest.h>

#include <memory>

using T = float;
Expand Down
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 @@ -122,8 +122,6 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- gmock>=1.13.0
- gtest>=1.13.0
- libcudf==24.6.*
- librmm==24.6.*
- proj
Expand Down Expand Up @@ -167,8 +165,6 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- gmock>=1.13.0
- gtest>=1.13.0
- librmm==24.6.*
- proj
- sqlite
Expand Down
Loading