Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull-request/5572' into ci-pin…
Browse files Browse the repository at this point in the history
…_clang-tidy_check_container_to_cuda_11.8
  • Loading branch information
csadorf committed Sep 8, 2023
2 parents 1112522 + 9658aa5 commit eaaba1a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .github/copy-pr-bot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Configuration file for `copy-pr-bot` GitHub App
# https://docs.gha-runners.nvidia.com/apps/copy-pr-bot/

enabled: true
1 change: 0 additions & 1 deletion .github/ops-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ auto_merger: true
branch_checker: true
label_checker: true
release_drafter: true
copy_prs: true
recently_updated: true
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ if(BUILD_CUML_CPP_LIBRARY)
# because cumlprims_mg and cuML inherit their CUDA libs from the raft::raft
# INTERFACE target.
list(APPEND ${_cuml_cpp_libs_var_name}
$<$<BOOL:${CUML_RAFT_COMPILED}>:raft::compiled>
$<$<BOOL:${CUML_RAFT_COMPILED}>:${RAFT_COMPILED_LIB}>
$<TARGET_NAME_IF_EXISTS:cumlprims_mg::cumlprims_mg>
)

Expand Down
18 changes: 7 additions & 11 deletions cpp/cmake/thirdparty/get_raft.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,14 @@ function(find_and_configure_raft)
string(APPEND RAFT_COMPONENTS " distributed")
endif()


if(PKG_COMPILE_LIBRARY)
string(APPEND RAFT_COMPONENTS " compiled")
set(RAFT_COMPILE_LIBRARY ON)
else()
set(RAFT_COMPILE_LIBRARY OFF)
endif()

set(RAFT_BUILD_SHARED_LIBS ON)
if(${PKG_USE_RAFT_STATIC})
set(RAFT_BUILD_SHARED_LIBS OFF)
if(NOT PKG_USE_RAFT_STATIC)
string(APPEND RAFT_COMPONENTS " compiled")
set(RAFT_COMPILED_LIB raft::compiled PARENT_SCOPE)
else()
string(APPEND RAFT_COMPONENTS " compiled_static")
set(RAFT_COMPILED_LIB raft::compiled_static PARENT_SCOPE)
endif()
endif()

# We need to set this each time so that on subsequent calls to cmake
Expand All @@ -68,7 +65,6 @@ function(find_and_configure_raft)
OPTIONS
"BUILD_TESTS OFF"
"BUILD_BENCH OFF"
"BUILD_SHARED_LIBS ${RAFT_BUILD_SHARED_LIBS}"
"RAFT_COMPILE_LIBRARY ${PKG_COMPILE_LIBRARY}"
)

Expand Down

0 comments on commit eaaba1a

Please sign in to comment.