From 9d33fce55ed1e0a73a2aa132a948d692b0302743 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 22 Jun 2022 18:38:23 -0500 Subject: [PATCH] Revert CMake changes. --- cpp/CMakeLists.txt | 6 ------ cpp/cmake/thirdparty/get_thrust.cmake | 26 -------------------------- cpp/versions.json | 10 ---------- 3 files changed, 42 deletions(-) delete mode 100644 cpp/cmake/thirdparty/get_thrust.cmake delete mode 100644 cpp/versions.json diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 20282b71b65..d0faeafca76 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -29,9 +29,6 @@ rapids_cuda_init_architectures(CUGRAPH) project(CUGRAPH VERSION 22.08.00 LANGUAGES C CXX CUDA) -include(${rapids-cmake-dir}/cpm/package_override.cmake) -rapids_cpm_package_override(${CMAKE_CURRENT_SOURCE_DIR}/versions.json) - if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) message(FATAL_ERROR "CUDA compiler version must be at least 11.0") @@ -147,9 +144,6 @@ rapids_cpm_init() # lags behind. ### -# Putting this before everything else to override other Thrust versions -include(cmake/thirdparty/get_thrust.cmake) - # Putting this before raft to override RAFT from pulling them in. include(cmake/thirdparty/get_libcudacxx.cmake) include(cmake/thirdparty/get_cuco.cmake) diff --git a/cpp/cmake/thirdparty/get_thrust.cmake b/cpp/cmake/thirdparty/get_thrust.cmake deleted file mode 100644 index d6535b0bee8..00000000000 --- a/cpp/cmake/thirdparty/get_thrust.cmake +++ /dev/null @@ -1,26 +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. -# ============================================================================= - -# Use CPM to find or clone thrust -function(find_and_configure_thrust) - - include(${rapids-cmake-dir}/cpm/thrust.cmake) - rapids_cpm_thrust( - NAMESPACE cugraph - BUILD_EXPORT_SET cugraph-exports - INSTALL_EXPORT_SET cugraph-exports) - -endfunction() - -find_and_configure_thrust() diff --git a/cpp/versions.json b/cpp/versions.json deleted file mode 100644 index 4cf78b622d6..00000000000 --- a/cpp/versions.json +++ /dev/null @@ -1,10 +0,0 @@ - -{ - "packages" : { - "Thrust" : { - "version" : "1.17.0", - "git_url" : "https://github.com/NVIDIA/thrust.git", - "git_tag" : "1.17.0" - } - } -}