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

Adding cuCollections to cmake #4011

Closed
wants to merge 2 commits into from
Closed

Adding cuCollections to cmake #4011

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
fc20d8a
FIX Update abs call for np 1.21 change
dantegd Jun 23, 2021
168f621
added cuco to cmake
divyegala Jun 23, 2021
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: 2 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ include(cmake/thirdparty/get_rmm.cmake)
include(cmake/thirdparty/get_faiss.cmake)
include(cmake/thirdparty/get_treelite.cmake)
include(cmake/thirdparty/get_raft.cmake)
include(cmake/thirdparty/get_cuco.cmake)

if(NOT SINGLEGPU)
include(cmake/thirdparty/get_nccl.cmake)
Expand Down Expand Up @@ -337,6 +338,7 @@ if(BUILD_CUML_CPP_LIBRARY)
cuml::Thrust
raft::raft
PRIVATE
cuco::cuco
CUDA::cublas
CUDA::cufft
CUDA::curand
Expand Down
35 changes: 35 additions & 0 deletions cpp/cmake/thirdparty/get_cuco.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#=============================================================================
# Copyright (c) 2021, 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_cuco VERSION)

rapids_cpm_find(cuco ${VERSION}
GLOBAL_TARGETS cuco cuco::cuco
CPM_ARGS
GIT_REPOSITORY https://github.com/NVIDIA/cuCollections.git
GIT_TAG e5e2abe55152608ef449ecf162a1ef52ded19801
OPTIONS "BUILD_TESTS OFF"
"BUILD_BENCHMARKS OFF"
"BUILD_EXAMPLES OFF"
)

if(NOT TARGET cuco::cuco)
add_library(cuco::cuco ALIAS cuco)
endif()

endfunction()

find_and_configure_cuco(0.0.1)
2 changes: 1 addition & 1 deletion python/cuml/test/test_dbscan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def test_dbscan_precomputed(datatype, nrows, max_mbytes_per_batch, out_dtype):

# Precompute distances
Xc = np.array([[complex(p[0], p[1]) for p in X]])
X_dist = np.abs(Xc - Xc.T, dtype=datatype)
X_dist = np.abs(Xc - Xc.T).astype(datatype)

eps = 1
cuml_dbscan = cuDBSCAN(eps=eps, min_samples=2, metric='precomputed',
Expand Down