Revert "Update JNI build to support nvcomp4 (NVIDIA#2217)"

This reverts commit 0bbefc0.
gerashegalov · Oct 2, 2024 · 6528393 · 6528393
1 parent a0f19f2
commit 6528393
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -605,6 +605,8 @@
                   <directory>${libcudfjni.build.path}</directory>
                   <includes>
                     <include>libnvcomp.so</include>
+                    <include>libnvcomp_gdeflate.so</include>
+                    <include>libnvcomp_bitcomp.so</include>
                   </includes>
                 </resource>
               </resources>

diff --git a/thirdparty/cudf b/thirdparty/cudf
diff --git a/thirdparty/cudf-pins/versions.json b/thirdparty/cudf-pins/versions.json
@@ -119,15 +119,15 @@
       "git_url" : "https://github.com/NVIDIA/nvcomp.git",
       "proprietary_binary" : 
       {
-        "aarch64-linux" : "https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp-linux-sbsa-${version}-cuda${cuda-toolkit-version-mapping}.tar.gz",
-        "x86_64-linux" : "https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp-linux-x86_64-${version}-cuda${cuda-toolkit-version-mapping}.tar.gz"
+        "aarch64-linux" : "https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp_${version}_SBSA_${cuda-toolkit-version-mapping}.tgz",
+        "x86_64-linux" : "https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp_${version}_x86_64_${cuda-toolkit-version-mapping}.tgz"
       },
       "proprietary_binary_cuda_version_mapping" : 
       {
         "11" : "11.x",
         "12" : "12.x"
       },
-      "version" : "4.0.1"
+      "version" : "3.0.6"
     },
     "nvtx3" : 
     {
+2 −0		ci/build_wheel_cudf.sh
+2 −0		ci/build_wheel_pylibcudf.sh
+1 −1		conda/environments/all_cuda-118_arch-x86_64.yaml
+1 −1		conda/environments/all_cuda-125_arch-x86_64.yaml
+1 −1		conda/recipes/libcudf/conda_build_config.yaml
+20 −6		cpp/include/cudf/io/nvcomp_adapter.hpp
+287 −60		cpp/src/io/comp/nvcomp_adapter.cpp
+11 −3		cpp/src/io/comp/nvcomp_adapter.hpp
+4 −4		cpp/src/io/orc/writer_impl.cu
+2 −12		cpp/src/io/parquet/reader_impl_chunking.cu
+1 −1		cpp/src/io/parquet/writer_impl_helpers.cpp
+29 −17		cpp/tests/io/comp/decomp_test.cpp
+1 −1		dependencies.yaml
+1 −5		docs/cudf/source/user_guide/io/io.md
+3 −1		java/pom.xml
+3 −0		java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java
+3 −2		java/src/main/native/CMakeLists.txt
+2 −1		python/libcudf/CMakeLists.txt