From 9356867d10dcacdd88005c79e10c44040e239afd Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Fri, 11 Oct 2024 16:26:54 -0500 Subject: [PATCH] Nvcomp revert followup (#2497) Signed-off-by: Robert (Bobby) Evans --- ci/submodule-sync.sh | 2 +- patches/revert_nvcomp4.patch | 82 +++++++++++++++++++++--------- pom.xml | 8 ++- thirdparty/cudf-pins/versions.json | 8 +-- 4 files changed, 68 insertions(+), 32 deletions(-) diff --git a/ci/submodule-sync.sh b/ci/submodule-sync.sh index 29b0cf5da..bd9d8d87b 100755 --- a/ci/submodule-sync.sh +++ b/ci/submodule-sync.sh @@ -71,7 +71,7 @@ echo "Test against ${cudf_sha}..." MVN="mvn -Dmaven.wagon.http.retryHandler.count=3 -B" set +e # Don't do a full build. Just try to update/build CUDF with no patches on top of it. -${MVN} validate ${MVN_MIRROR} \ +${MVN} antrun:run@build-libcudf ${MVN_MIRROR} \ -DCPP_PARALLEL_LEVEL=${PARALLEL_LEVEL} \ -Dlibcudf.build.configure=true \ -Dlibcudf.dependency.mode=latest \ diff --git a/patches/revert_nvcomp4.patch b/patches/revert_nvcomp4.patch index 88b58b14d..914c03308 100644 --- a/patches/revert_nvcomp4.patch +++ b/patches/revert_nvcomp4.patch @@ -25,7 +25,7 @@ index 5e9f7f8a0c..0e4745bda2 100755 ${package_dir}/dist/* diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml -index 5a05dfd053..e7363645d6 100644 +index bd5e6c3d56..74ca3fda1a 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -58,7 +58,7 @@ dependencies: @@ -38,11 +38,11 @@ index 5a05dfd053..e7363645d6 100644 - openpyxl - packaging diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml -index 8490296233..3559a1a341 100644 +index 565a3ebfa3..22619acf4a 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -56,7 +56,7 @@ dependencies: - - numba>=0.57 + - numba-cuda>=0.0.13 - numpy>=1.23,<3.0a0 - numpydoc -- nvcomp==4.0.1 @@ -50,6 +50,15 @@ index 8490296233..3559a1a341 100644 - nvtx>=0.2.1 - openpyxl - packaging +@@ -67,7 +67,7 @@ dependencies: + - pre-commit + - pyarrow>=14.0.0,<18.0.0a0 + - pydata-sphinx-theme!=0.14.2 +-- pynvjitlink>=0.0.0a0 ++- pynvjitlink + - pytest-benchmark + - pytest-cases>=3.8.2 + - pytest-cov diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index dc75eb4b25..67d501d746 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml @@ -697,7 +706,7 @@ index 60a64fb0ee..40cfbe763b 100644 /** diff --git a/cpp/src/io/parquet/reader_impl_chunking.cu b/cpp/src/io/parquet/reader_impl_chunking.cu -index c588fedb85..bab70c126b 100644 +index 27312a4da8..779d40281b 100644 --- a/cpp/src/io/parquet/reader_impl_chunking.cu +++ b/cpp/src/io/parquet/reader_impl_chunking.cu @@ -865,18 +865,8 @@ std::vector compute_page_splits_by_row(device_span=2.5.0,<2.6.0a0 +@@ -381,21 +381,21 @@ dependencies: + - output_types: conda + packages: # Align nvcomp version with rapids-cmake - - nvcomp==4.0.1 + - nvcomp==3.0.6 - - spdlog>=1.14.1,<1.15 + specific: + - output_types: [requirements, pyproject] + matrices: + - matrix: + cuda: "12.*" + packages: +- - nvidia-nvcomp-cu12==4.0.1 ++ - nvidia-nvcomp-cu12==3.0.6 + - matrix: + cuda: "11.*" + packages: +- - nvidia-nvcomp-cu11==4.0.1 ++ - nvidia-nvcomp-cu11==3.0.6 + - matrix: + packages: +- - nvidia-nvcomp==4.0.1 ++ - nvidia-nvcomp==3.0.6 rapids_build_skbuild: common: + - output_types: [conda, requirements, pyproject] +@@ -665,7 +665,7 @@ dependencies: + matrices: + - matrix: {cuda: "12.*"} + packages: +- - &pynvjitlink_unsuffixed pynvjitlink>=0.0.0a0 ++ - &pynvjitlink_unsuffixed pynvjitlink + - matrix: {cuda: "11.*"} + packages: + - &cubinlinker_unsuffixed cubinlinker +@@ -676,7 +676,7 @@ dependencies: + cuda: "12.*" + cuda_suffixed: "true" + packages: +- - pynvjitlink-cu12>=0.0.0a0 ++ - pynvjitlink-cu12 + - matrix: + cuda: "12.*" + cuda_suffixed: "false" diff --git a/docs/cudf/source/user_guide/io/io.md b/docs/cudf/source/user_guide/io/io.md index 97b961b455..adcdaa51e7 100644 --- a/docs/cudf/source/user_guide/io/io.md @@ -843,7 +887,7 @@ index 97b961b455..adcdaa51e7 100644 - ``` diff --git a/java/pom.xml b/java/pom.xml -index e4f1cdf64e..9694e741f1 100644 +index 450cfbdbc8..55cb055398 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,6 +1,6 @@ @@ -893,15 +937,3 @@ index 32045f3c50..c18a90140b 100644 COMMENT "Copying nvcomp libraries to ${PROJECT_BINARY_DIR}" ) endif() -diff --git a/python/libcudf/CMakeLists.txt b/python/libcudf/CMakeLists.txt -index 0a8f5c4807..96eb6c3bb3 100644 ---- a/python/libcudf/CMakeLists.txt -+++ b/python/libcudf/CMakeLists.txt -@@ -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} - ) diff --git a/pom.xml b/pom.xml index b9c687768..c3156fdb5 100644 --- a/pom.xml +++ b/pom.xml @@ -429,7 +429,7 @@ build-libcudf validate - + @@ -466,7 +466,8 @@ + executable="cmake" + unless:true="${submodule.patch.skip}"> @@ -483,6 +484,7 @@ build-libcudfjni validate + ${submodule.patch.skip} build-sparkrapidsjni validate + ${submodule.patch.skip} build-info generate-resources + ${submodule.patch.skip}