diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index cc09d56057..189f8268df 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -23,9 +23,7 @@ dependencies: - dask-cuda==24.6.* - doxygen>=1.8.20 - gcc_linux-aarch64=11.* -- gmock>=1.13.0 - graphviz -- gtest>=1.13.0 - ipython - joblib>=0.11 - libcublas-dev=11.11.3.6 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 9fbdcdaad4..e604705112 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -23,9 +23,7 @@ dependencies: - dask-cuda==24.6.* - doxygen>=1.8.20 - gcc_linux-64=11.* -- gmock>=1.13.0 - graphviz -- gtest>=1.13.0 - ipython - joblib>=0.11 - libcublas-dev=11.11.3.6 diff --git a/conda/environments/all_cuda-122_arch-aarch64.yaml b/conda/environments/all_cuda-122_arch-aarch64.yaml index 1e78e7deca..49c53b4cfe 100644 --- a/conda/environments/all_cuda-122_arch-aarch64.yaml +++ b/conda/environments/all_cuda-122_arch-aarch64.yaml @@ -24,9 +24,7 @@ dependencies: - dask-cuda==24.6.* - doxygen>=1.8.20 - gcc_linux-aarch64=11.* -- gmock>=1.13.0 - graphviz -- gtest>=1.13.0 - ipython - joblib>=0.11 - libcublas-dev diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 6d88855f30..6f782175dd 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -24,9 +24,7 @@ dependencies: - dask-cuda==24.6.* - doxygen>=1.8.20 - gcc_linux-64=11.* -- gmock>=1.13.0 - graphviz -- gtest>=1.13.0 - ipython - joblib>=0.11 - libcublas-dev diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml index 9c39da4507..385cd831fc 100644 --- a/conda/recipes/libraft/conda_build_config.yaml +++ b/conda/recipes/libraft/conda_build_config.yaml @@ -19,12 +19,6 @@ cmake_version: nccl_version: - ">=2.9.9" -gbench_version: - - "==1.8.0" - -gtest_version: - - ">=1.13.0" - glog_version: - ">=0.6.0" diff --git a/conda/recipes/libraft/meta.yaml b/conda/recipes/libraft/meta.yaml index 55f326dc53..c4fd0aa0b6 100644 --- a/conda/recipes/libraft/meta.yaml +++ b/conda/recipes/libraft/meta.yaml @@ -304,9 +304,6 @@ outputs: - libcusolver-dev - libcusparse-dev {% endif %} - - benchmark {{ gbench_version }} - - gmock {{ gtest_version }} - - gtest {{ gtest_version }} run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} @@ -319,9 +316,6 @@ outputs: - libcusparse {% endif %} - {{ pin_subpackage('libraft', exact=True) }} - - benchmark {{ gbench_version }} - - gmock {{ gtest_version }} - - gtest {{ gtest_version }} about: home: https://rapids.ai/ license: Apache-2.0 diff --git a/conda/recipes/raft-ann-bench/conda_build_config.yaml b/conda/recipes/raft-ann-bench/conda_build_config.yaml index da0b893c1d..6aa6f3d47d 100644 --- a/conda/recipes/raft-ann-bench/conda_build_config.yaml +++ b/conda/recipes/raft-ann-bench/conda_build_config.yaml @@ -19,9 +19,6 @@ cmake_version: nccl_version: - ">=2.9.9" -gtest_version: - - ">=1.13.0" - glog_version: - ">=0.6.0" diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index cbae4bfb3f..25475fc6f2 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -185,12 +185,13 @@ if(NOT BUILD_CPU_ONLY) endif() if(BUILD_TESTS) - include(cmake/thirdparty/get_gtest.cmake) + include(${rapids-cmake-dir}/cpm/gtest.cmake) + rapids_cpm_gtest(BUILD_STATIC) endif() if(BUILD_PRIMS_BENCH OR BUILD_ANN_BENCH) include(${rapids-cmake-dir}/cpm/gbench.cmake) - rapids_cpm_gbench() + rapids_cpm_gbench(BUILD_STATIC) endif() if(BUILD_CAGRA_HNSWLIB) diff --git a/cpp/cmake/thirdparty/get_gtest.cmake b/cpp/cmake/thirdparty/get_gtest.cmake deleted file mode 100644 index 7efad7886c..0000000000 --- a/cpp/cmake/thirdparty/get_gtest.cmake +++ /dev/null @@ -1,22 +0,0 @@ -#============================================================================= -# Copyright (c) 2021-2022, 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 -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -function(find_and_configure_gtest ) - include(${rapids-cmake-dir}/cpm/gtest.cmake) - rapids_cpm_gtest() -endfunction() - -find_and_configure_gtest() diff --git a/dependencies.yaml b/dependencies.yaml index 658b08421d..a83cd003d6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -358,8 +358,6 @@ dependencies: - output_types: [conda] packages: - *cmake_ver - - gtest>=1.13.0 - - gmock>=1.13.0 docs: common: - output_types: [conda]