From 0bbefc0f7b568cc3acd3c653677010127ce85b30 Mon Sep 17 00:00:00 2001
From: Peixin <pxli@nyu.edu>
Date: Fri, 6 Sep 2024 10:47:55 +0800
Subject: [PATCH] Update JNI build to support nvcomp4 (#2217)

* update JNI build to support nvcomp4

Signed-off-by: Peixin Li <pxLi@nyu.edu>
Co-authored-by: Yinqing Hao <haoyinqing@gmail.com>

* update cudf submodule ref to latest

* update rapids-cmake.sha

---------

Signed-off-by: Peixin Li <pxLi@nyu.edu>
Co-authored-by: Yinqing Hao <haoyinqing@gmail.com>
---
 pom.xml                               | 2 --
 thirdparty/cudf                       | 2 +-
 thirdparty/cudf-pins/rapids-cmake.sha | 2 +-
 thirdparty/cudf-pins/versions.json    | 6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8770f51b2b..50da08d178 100644
--- a/pom.xml
+++ b/pom.xml
@@ -605,8 +605,6 @@
                   <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
index 949f171922..7018a33be7 160000
--- a/thirdparty/cudf
+++ b/thirdparty/cudf
@@ -1 +1 @@
-Subproject commit 949f1719226f0b27a4df8fedbf4624f46fb0589d
+Subproject commit 7018a33be752da9363db5431560d8d12bf378920
diff --git a/thirdparty/cudf-pins/rapids-cmake.sha b/thirdparty/cudf-pins/rapids-cmake.sha
index 50bbe2c112..6c90156bd9 100644
--- a/thirdparty/cudf-pins/rapids-cmake.sha
+++ b/thirdparty/cudf-pins/rapids-cmake.sha
@@ -1 +1 @@
-0652a0ac9f8fd589ecd6c220da313a7c8bec2abd
+3c9bed0cbd0b2ebcdcc5676c83efc1331f22c52c
\ No newline at end of file
diff --git a/thirdparty/cudf-pins/versions.json b/thirdparty/cudf-pins/versions.json
index 2b6bc58046..5551b9b113 100644
--- a/thirdparty/cudf-pins/versions.json
+++ b/thirdparty/cudf-pins/versions.json
@@ -120,15 +120,15 @@
       "git_url" : "https://github.com/NVIDIA/nvcomp.git",
       "proprietary_binary" : 
       {
-        "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"
+        "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"
       },
       "proprietary_binary_cuda_version_mapping" : 
       {
         "11" : "11.x",
         "12" : "12.x"
       },
-      "version" : "3.0.6"
+      "version" : "4.0.1"
     },
     "nvtx3" : 
     {