From 13ca35e39ac04b005a9ff41c4f75bfc6fe16868b Mon Sep 17 00:00:00 2001 From: spark-rapids automation <70000568+nvauto@users.noreply.github.com> Date: Fri, 13 Dec 2024 03:11:13 +0000 Subject: [PATCH] Auto-merge use branch-25.02 versions Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com> --- thirdparty/cudf | 2 +- thirdparty/cudf-pins/rapids-cmake.sha | 2 +- thirdparty/cudf-pins/versions.json | 30 +++++++++++++-------------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/thirdparty/cudf b/thirdparty/cudf index ff41ecf47..92652be87 160000 --- a/thirdparty/cudf +++ b/thirdparty/cudf @@ -1 +1 @@ -Subproject commit ff41ecf473b7e7be01885c66cd90571ccc48e41d +Subproject commit 92652be87839e4a4e49216c49bd36860674bff6a diff --git a/thirdparty/cudf-pins/rapids-cmake.sha b/thirdparty/cudf-pins/rapids-cmake.sha index 7d0903493..548497fbe 100644 --- a/thirdparty/cudf-pins/rapids-cmake.sha +++ b/thirdparty/cudf-pins/rapids-cmake.sha @@ -1 +1 @@ -cb1a30c8f12923fe1f56b1948cb8b26d5676f6b9 +ca12bcd54230d3758072faddc8d4430a9e44cd66 diff --git a/thirdparty/cudf-pins/versions.json b/thirdparty/cudf-pins/versions.json index dafc97873..c745b1877 100644 --- a/thirdparty/cudf-pins/versions.json +++ b/thirdparty/cudf-pins/versions.json @@ -5,20 +5,10 @@ { "always_download" : true, "git_shallow" : false, - "git_tag" : "e21d607157218540cd7c45461213fb96adf720b7", + "git_tag" : "05e019afe53f9b0e4454cbd822f9bdda18df49bb", "git_url" : "https://github.com/NVIDIA/cccl.git", "patches" : [ - { - "file" : "${current_json_dir}/../cudf/cpp/cmake/thirdparty/patches/cccl_symbol_visibility.diff", - "fixed_in" : "2.6", - "issue" : "Correct symbol visibility issues in libcudacxx [https://github.com/NVIDIA/cccl/pull/1832/]" - }, - { - "file" : "${current_json_dir}/../cudf/cpp/cmake/thirdparty/patches/thrust_disable_64bit_dispatching.diff", - "fixed_in" : "", - "issue" : "Remove 64bit dispatching as not needed by libcudf and results in compiling twice as many kernels [https://github.com/rapidsai/cudf/pull/11437]" - }, { "file" : "${current_json_dir}/../cudf/cpp/cmake/thirdparty/patches/thrust_faster_sort_compile_times.diff", "fixed_in" : "", @@ -30,7 +20,7 @@ "issue" : "Improve Thrust scan compile times by reducing the number of kernels generated [https://github.com/rapidsai/cudf/pull/8183]" } ], - "version" : "2.5.0" + "version" : "2.7.0" }, "GTest" : { @@ -99,9 +89,9 @@ { "always_download" : true, "git_shallow" : false, - "git_tag" : "e2ff91954a2ebe3ee65e0a1568e9d77cb195164d", + "git_tag" : "288535770abbe950ab8ec655d44f5aa9d6704cea", "git_url" : "https://github.com/rapidsai/kvikio.git", - "version" : "24.12" + "version" : "25.02" }, "nanoarrow" : { @@ -145,13 +135,21 @@ "git_url" : "https://github.com/NVIDIA/NVTX.git", "version" : "3.1.0" }, + "rapids_logger" : + { + "always_download" : true, + "git_shallow" : false, + "git_tag" : "c510947ae9d3a67530cfe3e5eaccb5a3b8ea0e55", + "git_url" : "https://github.com/rapidsai/rapids-logger.git", + "version" : "c510947ae9d3a67530cfe3e5eaccb5a3b8ea0e55" + }, "rmm" : { "always_download" : true, "git_shallow" : false, - "git_tag" : "b391ce867a62bbfc3283779d70231be5b00e2e84", + "git_tag" : "3cad8fed150c3905962ca849b11bfc12fadd2517", "git_url" : "https://github.com/rapidsai/rmm.git", - "version" : "24.12" + "version" : "25.02" }, "spdlog" : {