Skip to content

Add support for nvcomp-2.3 in java build #10837

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

Closed
jbrennan333 wants to merge 5 commits into from
Closed

Add support for nvcomp-2.3 in java build #10837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
168af05
Add support for nvcomp-2.3 in java build
jbrennan333 May 10, 2022
f2f9ad9
Update copyrights.
jbrennan333 May 12, 2022
7f5d453
Use $<TARGET_FILE:nvcomp::nvcomp> to get the full path
jbrennan333 May 12, 2022
d8b8c89
Add COMMENT to custom command to fix checkstyle issue
jbrennan333 May 12, 2022
ff46fd3
Merge branch 'branch-22.06' into jtb-nvcomp-2.3
jbrennan333 May 15, 2022
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
3 changes: 3 additions & 0 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,9 @@
<includes>
<include>libcudfjni.so</include>
<include>libcufilejni.so</include>
<include>libnvcomp.so</include>
<include>libnvcomp_gdeflate.so</include>
<include>libnvcomp_bitcomp.so</include>
</includes>
</resource>
<resource>
Expand Down
8 changes: 7 additions & 1 deletion java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, NVIDIA CORPORATION.
* Copyright (c) 2019-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.
Expand Down Expand Up @@ -54,6 +54,12 @@ public class NativeDepsLoader {
* subsequent stages are loaded.
Comment thread
jlowe marked this conversation as resolved.
*/
private static final String[][] loadOrder = new String[][]{
new String[]{
"nvcomp_bitcomp", "nvcomp_gdeflate"
},
new String[]{
"nvcomp"
},
new String[]{
"cudf"
},
Expand Down
13 changes: 13 additions & 0 deletions java/src/main/native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,3 +240,16 @@ else()
# Tell CMake what CUDA language runtime to use
set_target_properties(cudfjni PROPERTIES CUDA_RUNTIME_LIBRARY Shared)
endif()

# ##################################################################################################
# * install shared libraries ----------------------------------------------------------------------
if(TARGET nvcomp::nvcomp)
add_custom_command(
TARGET cudfjni PRE_LINK COMMAND ${CMAKE_COMMAND} -E copy
$<TARGET_FILE:nvcomp::nvcomp>
$<TARGET_FILE:nvcomp::nvcomp_gdeflate>
$<TARGET_FILE:nvcomp::nvcomp_bitcomp>
"${PROJECT_BINARY_DIR}"
COMMENT "Copying nvcomp libraries to ${PROJECT_BINARY_DIR}"
)
endif()