Fix NVTX3 dependency (#2072)

* Fix NVTX3 dependency Signed-off-by: Jason Lowe <jlowe@nvidia.com> * Update pinned version of rapids-cmake --------- Signed-off-by: Jason Lowe <jlowe@nvidia.com>
NVIDIA · May 24, 2024 · a77db76 · a77db76
1 parent 6d68216
commit a77db76
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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
diff --git a/thirdparty/cudf-pins/rapids-cmake.sha b/thirdparty/cudf-pins/rapids-cmake.sha
@@ -1 +1 @@
-2f2a3c37af91d11347a8f64bc6e90197fc53eea2
+41dc9623dbb8e5bdd2bccc22815efb9db6a49280
diff --git 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"
     },
+2 −2		cpp/CMakeLists.txt
+1 −1		cpp/benchmarks/CMakeLists.txt
+7 −9		cpp/cmake/thirdparty/get_nvtx.cmake
+35 −0		cpp/include/cudf/io/csv.hpp
+3 −1		cpp/include/cudf/io/memory_resource.hpp
+13 −3		cpp/src/io/csv/csv_gpu.cu
+4 −2		cpp/src/io/csv/reader_impl.cu
+13 −7		cpp/src/io/utilities/config_utils.cpp
+3 −0		cpp/src/io/utilities/parsing_utils.cuh
+2 −2		cpp/tests/CMakeLists.txt
+41 −0		cpp/tests/io/csv_test.cpp
+5 −2		java/src/main/java/ai/rapids/cudf/PinnedMemoryPool.java
+4 −1		java/src/main/java/ai/rapids/cudf/Rmm.java
+1 −1		java/src/main/native/CMakeLists.txt
+5 −6		java/src/main/native/src/RmmJni.cpp
+71 −3		python/cudf/cudf/_lib/parquet.pyx
+3 −0		python/cudf/cudf/_lib/pylibcudf/libcudf/io/csv.pxd
+17 −1		python/cudf/cudf/_lib/pylibcudf/libcudf/io/types.pxd
+23 −53		python/cudf/cudf/core/column/column.py
+131 −93		python/cudf/cudf/core/dataframe.py
+5 −5		python/cudf/cudf/core/groupby/groupby.py
+82 −84		python/cudf/cudf/core/indexed_frame.py
+2 −2		python/cudf/cudf/core/join/_join_helpers.py
+6 −6		python/cudf/cudf/core/join/join.py
+5 −5		python/cudf/cudf/core/reshape.py
+28 −28		python/cudf/cudf/core/series.py
+64 −0		python/cudf/cudf/io/parquet.py
+2 −7		python/cudf/cudf/tests/test_dlpack.py
+76 −0		python/cudf/cudf/tests/test_parquet.py
+16 −0		python/cudf/cudf/utils/ioutils.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2f2a3c37af91d11347a8f64bc6e90197fc53eea2
		41dc9623dbb8e5bdd2bccc22815efb9db6a49280