Fix cudf submodule sync (#2629)

* Include NVTX ranges header Signed-off-by: Jason Lowe <[email protected]> * Update to latest cudf 25.02 --------- Signed-off-by: Jason Lowe <[email protected]>
NVIDIA · Nov 27, 2024 · 4d5b51d · 4d5b51d
1 parent 31e478f
commit 4d5b51d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 4 deletions.
diff --git 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/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
@@ -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
@@ -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
diff --git 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
@@ -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"
     },
+26 −0		.github/workflows/trigger-breaking-change-alert.yaml
+2 −4		cpp/include/cudf/detail/utilities/cuda.cuh
+5 −5		cpp/include/cudf/strings/detail/gather.cuh
+6 −16		cpp/src/binaryop/jit/kernel.cu
+1 −0		cpp/src/copying/contiguous_split.cu
+1 −0		cpp/src/join/conditional_join.cu
+1 −0		cpp/src/join/hash_join.cu
+1 −0		cpp/src/join/join.cu
+0 −5		cpp/src/join/join_common_utils.hpp
+1 −0		cpp/src/join/mixed_join.cu
+1 −0		cpp/src/join/mixed_join_semi.cu
+1 −0		cpp/src/json/json_path.cu
+1 −0		cpp/src/labeling/label_bins.cu
+1 −0		cpp/src/lists/contains.cu
+1 −0		cpp/src/lists/copying/segmented_gather.cu
+1 −0		cpp/src/quantiles/tdigest/tdigest.cu
+1 −0		cpp/src/reductions/minmax.cu
+1 −0		cpp/src/rolling/detail/rolling_fixed_window.cu
+1 −0		cpp/src/rolling/detail/rolling_variable_window.cu
+1 −0		cpp/src/rolling/grouped_rolling.cu
+4 −2		cpp/src/strings/convert/convert_urls.cu
+6 −5		cpp/src/strings/copying/concatenate.cu
+2 −2		cpp/src/strings/regex/utilities.cuh
+7 −9		cpp/src/strings/search/find.cu
+3 −6		cpp/src/text/minhash.cu
+2 −3		cpp/src/text/subword/data_normalizer.cu
+3 −8		cpp/src/text/subword/subword_tokenize.cu
+4 −10		cpp/src/text/subword/wordpiece_tokenizer.cu
+3 −6		cpp/src/text/vocabulary_tokenize.cu
+0 −1		python/cudf/cudf/_lib/CMakeLists.txt
+0 −1		python/cudf/cudf/_lib/__init__.py
+0 −43		python/cudf/cudf/_lib/join.pyx
+83 −84		python/cudf/cudf/_lib/orc.pyx
+8 −4		python/cudf/cudf/core/column/column.py
+16 −3		python/cudf/cudf/core/groupby/groupby.py
+11 −1		python/cudf/cudf/core/index.py
+45 −15		python/cudf/cudf/core/join/join.py
+15 −4		python/cudf/cudf/core/multiindex.py
+56 −21		python/cudf_polars/cudf_polars/dsl/expressions/boolean.py
+79 −19		python/cudf_polars/cudf_polars/dsl/expressions/datetime.py
+99 −36		python/cudf_polars/cudf_polars/dsl/expressions/string.py
+4 −6		python/cudf_polars/cudf_polars/dsl/to_ast.py
+10 −4		python/cudf_polars/cudf_polars/dsl/translate.py
+56 −0		python/cudf_polars/tests/dsl/test_serialization.py
+63 −2		python/pylibcudf/pylibcudf/io/orc.pxd
+49 −2		python/pylibcudf/pylibcudf/io/orc.pyi
+412 −1		python/pylibcudf/pylibcudf/io/orc.pyx
+12 −5		python/pylibcudf/pylibcudf/io/types.pxd
+11 −11		python/pylibcudf/pylibcudf/io/types.pyi
+42 −19		python/pylibcudf/pylibcudf/io/types.pyx
+62 −0		python/pylibcudf/pylibcudf/tests/io/test_orc.py
+28 −0		python/pylibcudf/pylibcudf/tests/io/test_types.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9f89c0bba79d61c1fe460e5177c53267a8f83908
		fa61767d1584a9c8d083aa9ce8636af89cc63923