Always use a static gtest and gbench (rapidsai#1377)

Use static GTest and Benchmark. Authors: - Paul Taylor (https://github.com/trxcllnt) Approvers: - Robert Maynard (https://github.com/robertmaynard) - Michael Wang (https://github.com/isVoid) - Jake Awe (https://github.com/AyodeAwe) URL: rapidsai#1377
trxcllnt · Apr 26, 2024 · 37f35f8 · 37f35f8
1 parent 76762fc
commit 37f35f8
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 96 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -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.*

diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml
@@ -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.*

diff --git a/conda/recipes/libcuspatial/meta.yaml b/conda/recipes/libcuspatial/meta.yaml
@@ -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] %}
@@ -46,8 +46,6 @@ requirements:
   host:
     - cuda-version ={{ cuda_version }}
     - doxygen
-    - gmock {{ gtest_version }}
-    - gtest {{ gtest_version }}
     - libcudf ={{ minor_version }}
     - librmm ={{ minor_version }}
     - sqlite
@@ -129,5 +127,3 @@ outputs:
         - cuda-cudart
         {% endif %}
         - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
-        - gmock {{ gtest_version }}
-        - gtest {{ gtest_version }}
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -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)
@@ -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

diff --git a/cpp/cmake/thirdparty/get_gtest.cmake b/cpp/cmake/thirdparty/get_gtest.cmake
diff --git a/cpp/cuproj/CMakeLists.txt b/cpp/cuproj/CMakeLists.txt
@@ -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()
 
 ###################################################################################################
@@ -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

diff --git a/cpp/cuproj/cmake/thirdparty/get_gtest.cmake b/cpp/cuproj/cmake/thirdparty/get_gtest.cmake
diff --git a/cpp/tests/bounding_boxes/linestring_bounding_boxes_test.cpp b/cpp/tests/bounding_boxes/linestring_bounding_boxes_test.cpp
@@ -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;

diff --git a/cpp/tests/bounding_boxes/polygon_bounding_boxes_test.cpp b/cpp/tests/bounding_boxes/polygon_bounding_boxes_test.cpp
@@ -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;

diff --git a/cpp/tests/join/quadtree_point_in_polygon_test.cpp b/cpp/tests/join/quadtree_point_in_polygon_test.cpp
@@ -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;

diff --git a/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp b/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp
@@ -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;

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -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
@@ -167,8 +165,6 @@ dependencies:
         packages:
           - c-compiler
           - cxx-compiler
-          - gmock>=1.13.0
-          - gtest>=1.13.0
           - librmm==24.6.*
           - proj
           - sqlite