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

Adapt to rmm logger changes #499

Merged
merged 22 commits into from
Nov 30, 2024
Merged

Adapt to rmm logger changes #499

Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ae6c322
Adapt to rmm logger changes
vyasr Nov 17, 2024
9e151ff
Make linkage unconditional and private
vyasr Nov 27, 2024
67e0fbc
Also link to the logger in the tests
vyasr Nov 27, 2024
09e99f8
Use an object library to avoid recompilation
vyasr Nov 27, 2024
78b4e9a
Also add to examples
vyasr Nov 27, 2024
5c33907
Also add target to Python packages
vyasr Nov 27, 2024
0dd462e
Typo
vyasr Nov 27, 2024
b828cab
One more typo
vyasr Nov 27, 2024
1c03106
Another typo :(
vyasr Nov 28, 2024
bed2a45
More Python packages
vyasr Nov 28, 2024
16846b3
Use an object library for the examples
vyasr Nov 28, 2024
996f038
Use an object library for Python
vyasr Nov 28, 2024
8f05d25
Revert erroneous pyproject changes
vyasr Nov 28, 2024
b3a1554
Uniquify target name
vyasr Nov 28, 2024
2f90240
Also need for the C API.
vyasr Nov 28, 2024
f073f07
Add linkage to C++ benchmarks built with Python build
vyasr Nov 28, 2024
a00a9ac
Only link to rmm if GPU-enabled
vyasr Nov 28, 2024
2a1071b
Preload OpenMP for TLS
vyasr Nov 28, 2024
66870b6
Find the library instead of assuming a path.
vyasr Nov 28, 2024
a80188a
Test print
vyasr Nov 28, 2024
3619d3c
Import sklearn since the problem is the mangled, bundled openmp
vyasr Nov 28, 2024
5a2d871
Fix style
vyasr Nov 28, 2024
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
7 changes: 4 additions & 3 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,12 +480,13 @@ if(BUILD_SHARED_LIBS)
"$<$<COMPILE_LANGUAGE:CUDA>:${CUVS_CUDA_FLAGS}>"
)
target_link_libraries(
cuvs_objs PUBLIC raft::raft rmm::rmm ${CUVS_CTK_MATH_DEPENDENCIES}
cuvs_objs PUBLIC raft::raft rmm::rmm rmm::rmm_logger ${CUVS_CTK_MATH_DEPENDENCIES}
$<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
PRIVATE rmm::rmm_logger_impl
)

add_library(cuvs SHARED $<TARGET_OBJECTS:cuvs_objs>)
add_library(cuvs_static STATIC $<TARGET_OBJECTS:cuvs_objs>)
add_library(cuvs SHARED $<FILTER:$<TARGET_OBJECTS:cuvs_objs>,EXCLUDE,rmm.*logger>)
add_library(cuvs_static STATIC $<FILTER:$<TARGET_OBJECTS:cuvs_objs>,EXCLUDE,rmm.*logger>)

target_compile_options(
cuvs INTERFACE $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:--expt-extended-lambda
Expand Down
Loading