From 44b54d178c0a4fb09f1abc3e7715e46cd6b7bf83 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Fri, 24 May 2024 10:09:56 -0500
Subject: [PATCH 1/2] Fix NVTX3 dependency

Signed-off-by: Jason Lowe <jlowe@nvidia.com>
---
 src/main/cpp/CMakeLists.txt        |  2 +-
 thirdparty/cudf                    |  2 +-
 thirdparty/cudf-pins/versions.json | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
index 169067bfdd..fd9d671d6f 100644
--- a/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -233,7 +233,7 @@ target_link_libraries(
   -Wl,--whole-archive
     ${CUDFJNI_LIB}
     cudf::cudf
-    nvtx3-cpp
+    nvtx3::nvtx3-cpp
   -Wl,--no-whole-archive
     ${PARQUET_LIB}
     ${THRIFT_LIB}
diff --git a/thirdparty/cudf b/thirdparty/cudf
index 45dc595945..8b5ff188e7 160000
--- a/thirdparty/cudf
+++ b/thirdparty/cudf
@@ -1 +1 @@
-Subproject commit 45dc595945301f4076e66ec54a6e4de0b539cfb0
+Subproject commit 8b5ff188e79bb79ca0c2d581e94d3a91654a2d31
diff --git a/thirdparty/cudf-pins/versions.json b/thirdparty/cudf-pins/versions.json
index a0384f40f2..662cbb8dc9 100644
--- a/thirdparty/cudf-pins/versions.json
+++ b/thirdparty/cudf-pins/versions.json
@@ -71,14 +71,6 @@
       "git_url" : "https://github.com/rapidsai/kvikio.git",
       "version" : "24.06"
     },
-    "NVTX3" : 
-    {
-      "always_download" : true,
-      "git_shallow" : false,
-      "git_tag" : "e170594ac7cf1dac584da473d4ca9301087090c1",
-      "git_url" : "https://github.com/NVIDIA/NVTX.git",
-      "version" : "3.1.0"
-    },
     "cuco" : 
     {
       "always_download" : true,
@@ -148,11 +140,19 @@
       },
       "version" : "3.0.6"
     },
+    "nvtx3" : 
+    {
+      "always_download" : true,
+      "git_shallow" : false,
+      "git_tag" : "e170594ac7cf1dac584da473d4ca9301087090c1",
+      "git_url" : "https://github.com/NVIDIA/NVTX.git",
+      "version" : "3.1.0"
+    },
     "rmm" : 
     {
       "always_download" : true,
       "git_shallow" : false,
-      "git_tag" : "46e153c18d17b07526d6ff2e04859fcbbd706879",
+      "git_tag" : "dc1e17a03ed2dbc9329ccecc27922e414250f45a",
       "git_url" : "https://github.com/rapidsai/rmm.git",
       "version" : "24.06"
     },

From 6c1e2213d8d822db04e0f5203b91e59f78860f5b Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Fri, 24 May 2024 10:46:57 -0500
Subject: [PATCH 2/2] Update pinned version of rapids-cmake

---
 thirdparty/cudf-pins/rapids-cmake.sha | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thirdparty/cudf-pins/rapids-cmake.sha b/thirdparty/cudf-pins/rapids-cmake.sha
index 245472ded1..20bbb44986 100644
--- a/thirdparty/cudf-pins/rapids-cmake.sha
+++ b/thirdparty/cudf-pins/rapids-cmake.sha
@@ -1 +1 @@
-2f2a3c37af91d11347a8f64bc6e90197fc53eea2
+41dc9623dbb8e5bdd2bccc22815efb9db6a49280