Skip to content

Commit

Permalink
Revert "Upgrade to nvcomp 4.0.1 (rapidsai#16076)"
Browse files Browse the repository at this point in the history
This reverts commit 0cc059f.
  • Loading branch information
gerashegalov committed Oct 2, 2024
1 parent f20491d commit f028292
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 8 deletions.
2 changes: 2 additions & 0 deletions ci/build_wheel_cudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export PIP_CONSTRAINT="/tmp/constraints.txt"
python -m auditwheel repair \
--exclude libcudf.so \
--exclude libnvcomp.so \
--exclude libnvcomp_bitcomp.so \
--exclude libnvcomp_gdeflate.so \
-w ${package_dir}/final_dist \
${package_dir}/dist/*

Expand Down
2 changes: 2 additions & 0 deletions ci/build_wheel_pylibcudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export PIP_CONSTRAINT="/tmp/constraints.txt"
python -m auditwheel repair \
--exclude libcudf.so \
--exclude libnvcomp.so \
--exclude libnvcomp_bitcomp.so \
--exclude libnvcomp_gdeflate.so \
-w ${package_dir}/final_dist \
${package_dir}/dist/*

Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies:
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
- nvcomp==4.0.1
- nvcomp==3.0.6
- nvtx>=0.2.1
- openpyxl
- packaging
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ dependencies:
- numba>=0.57
- numpy>=1.23,<3.0a0
- numpydoc
- nvcomp==4.0.1
- nvcomp==3.0.6
- nvtx>=0.2.1
- openpyxl
- packaging
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcudf/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spdlog_version:
- ">=1.14.1,<1.15"

nvcomp_version:
- "=4.0.1"
- "=3.0.6"

zlib_version:
- ">=1.2.13"
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ dependencies:
- flatbuffers==24.3.25
- librdkafka>=2.5.0,<2.6.0a0
# Align nvcomp version with rapids-cmake
- nvcomp==4.0.1
- nvcomp==3.0.6
- spdlog>=1.14.1,<1.15
rapids_build_skbuild:
common:
Expand Down
4 changes: 3 additions & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019-2024, NVIDIA CORPORATION.
Copyright (c) 2019-2023, 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 @@ -590,6 +590,8 @@
<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
3 changes: 3 additions & 0 deletions java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public class NativeDepsLoader {
* subsequent stages are loaded.
*/
private static final String[][] loadOrder = new String[][]{
new String[]{
"nvcomp_bitcomp", "nvcomp_gdeflate"
},
new String[]{
"nvcomp"
},
Expand Down
5 changes: 3 additions & 2 deletions java/src/main/native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,9 @@ if(TARGET nvcomp::nvcomp)
add_custom_command(
TARGET cudfjni
PRE_LINK
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:nvcomp::nvcomp>
"${PROJECT_BINARY_DIR}/libnvcomp.so"
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()
3 changes: 2 additions & 1 deletion python/libcudf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@ add_subdirectory(../../cpp cudf-cpp)
# Ensure other libraries needed by libcudf.so get installed alongside it.
include(cmake/Modules/WheelHelpers.cmake)
install_aliased_imported_targets(
TARGETS cudf nvcomp::nvcomp DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
TARGETS cudf nvcomp::nvcomp nvcomp::nvcomp_gdeflate nvcomp::nvcomp_bitcomp DESTINATION
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
)

0 comments on commit f028292

Please sign in to comment.