From c299122c8d087f70c5ea467764b3a80d5ba7390f Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Tue, 26 Nov 2024 15:41:58 -0600
Subject: [PATCH 1/2] Include NVTX ranges header

Signed-off-by: Jason Lowe <jlowe@nvidia.com>
---
 src/main/cpp/src/from_json_to_structs.cu | 1 +
 src/main/cpp/src/json_utils.cu           | 1 +
 src/main/cpp/src/parse_uri.cu            | 1 +
 thirdparty/cudf                          | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/cpp/src/from_json_to_structs.cu b/src/main/cpp/src/from_json_to_structs.cu
index ddfdcc4c4f..3d7ddbb1c3 100644
--- a/src/main/cpp/src/from_json_to_structs.cu
+++ b/src/main/cpp/src/from_json_to_structs.cu
@@ -21,6 +21,7 @@
 #include <cudf/column/column_factories.hpp>
 #include <cudf/detail/iterator.cuh>
 #include <cudf/detail/null_mask.hpp>
+#include <cudf/detail/nvtx/ranges.hpp>
 #include <cudf/detail/utilities/cuda.cuh>
 #include <cudf/detail/valid_if.cuh>
 #include <cudf/io/json.hpp>
diff --git a/src/main/cpp/src/json_utils.cu b/src/main/cpp/src/json_utils.cu
index ef3d0db0f8..e40b092332 100644
--- a/src/main/cpp/src/json_utils.cu
+++ b/src/main/cpp/src/json_utils.cu
@@ -15,6 +15,7 @@
  */
 
 #include <cudf/column/column_device_view.cuh>
+#include <cudf/detail/nvtx/ranges.hpp>
 #include <cudf/detail/utilities/cuda.cuh>
 #include <cudf/detail/valid_if.cuh>
 #include <cudf/strings/detail/combine.hpp>
diff --git a/src/main/cpp/src/parse_uri.cu b/src/main/cpp/src/parse_uri.cu
index d2479403ba..485c0f0391 100644
--- a/src/main/cpp/src/parse_uri.cu
+++ b/src/main/cpp/src/parse_uri.cu
@@ -18,6 +18,7 @@
 
 #include <cudf/detail/get_value.cuh>
 #include <cudf/detail/null_mask.hpp>
+#include <cudf/detail/nvtx/ranges.hpp>
 #include <cudf/detail/utilities/cuda.cuh>
 #include <cudf/detail/utilities/vector_factories.hpp>
 #include <cudf/detail/valid_if.cuh>
diff --git a/thirdparty/cudf b/thirdparty/cudf
index 79a9860676..305182e58c 160000
--- a/thirdparty/cudf
+++ b/thirdparty/cudf
@@ -1 +1 @@
-Subproject commit 79a986067688c18b3d431c7a3acc23e2307fb668
+Subproject commit 305182e58c19add98a5abd6a5b00d9b266f41732

From 65647bdad5d4180aa3cf24deae0a8e93f69a0062 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Tue, 26 Nov 2024 16:43:15 -0600
Subject: [PATCH 2/2] Update to latest cudf 25.02

---
 src/main/cpp/CMakeLists.txt           | 2 ++
 thirdparty/cudf                       | 2 +-
 thirdparty/cudf-pins/rapids-cmake.sha | 2 +-
 thirdparty/cudf-pins/versions.json    | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
index 6447e27076..77d6cd874d 100644
--- a/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -281,6 +281,8 @@ target_link_libraries(
     ${ARROW_LIB}
     ${PARQUET_LIB}
     ${THRIFT_LIB}
+  PUBLIC rmm::rmm
+  PRIVATE $<TARGET_NAME_IF_EXISTS:rmm::rmm_logger_impl>
 )
 rapids_cuda_set_runtime(spark_rapids_jni USE_STATIC ON)
 set_target_properties(spark_rapids_jni PROPERTIES LINK_LANGUAGE "CXX")
diff --git a/thirdparty/cudf b/thirdparty/cudf
index 305182e58c..fa62ff45ed 160000
--- a/thirdparty/cudf
+++ b/thirdparty/cudf
@@ -1 +1 @@
-Subproject commit 305182e58c19add98a5abd6a5b00d9b266f41732
+Subproject commit fa62ff45eddd8256f0a3e8cebf077970dd70cb67
diff --git a/thirdparty/cudf-pins/rapids-cmake.sha b/thirdparty/cudf-pins/rapids-cmake.sha
index fde798b573..fad760dd73 100644
--- a/thirdparty/cudf-pins/rapids-cmake.sha
+++ b/thirdparty/cudf-pins/rapids-cmake.sha
@@ -1 +1 @@
-9f89c0bba79d61c1fe460e5177c53267a8f83908
+fa61767d1584a9c8d083aa9ce8636af89cc63923
diff --git a/thirdparty/cudf-pins/versions.json b/thirdparty/cudf-pins/versions.json
index 77095ff6b8..752f515108 100644
--- a/thirdparty/cudf-pins/versions.json
+++ b/thirdparty/cudf-pins/versions.json
@@ -99,7 +99,7 @@
     {
       "always_download" : true,
       "git_shallow" : false,
-      "git_tag" : "38ed0f513d48868b3e9876c98118d02e861f19f0",
+      "git_tag" : "e82574ba3787d5c6b1d1cd3f6aba02b52b233f45",
       "git_url" : "https://github.com/rapidsai/kvikio.git",
       "version" : "25.02"
     },
@@ -149,7 +149,7 @@
     {
       "always_download" : true,
       "git_shallow" : false,
-      "git_tag" : "d54a28a3f5481c8129b7442fb389c369ff18f04b",
+      "git_tag" : "c9c6039ab71f91fb41376abea7ec36b8a2563de1",
       "git_url" : "https://github.com/rapidsai/rmm.git",
       "version" : "25.02"
     },