Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[auto-merge] bot-auto-merge-branch-24.12 to branch-25.02 [skip ci] [bot] #2750

Merged
merged 2 commits into from
Jan 10, 2025
Merged

[auto-merge] bot-auto-merge-branch-24.12 to branch-25.02 [skip ci] [bot] #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b56f1df
Update version to 24.12.1 (#2749)
nvauto Jan 10, 2025
9adcfa6
Auto-merge use branch-25.02 versions
nvauto Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022-2024, NVIDIA CORPORATION.
Copyright (c) 2022-2025, NVIDIA CORPORATION.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@

<groupId>com.nvidia</groupId>
<artifactId>spark-rapids-jni</artifactId>
<version>24.12.0-SNAPSHOT</version>
<version>24.12.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>RAPIDS Accelerator JNI for Apache Spark</name>
<description>
Expand Down
4 changes: 2 additions & 2 deletions src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
# Copyright (c) 2022-2025, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -51,7 +51,7 @@ rapids_cuda_init_architectures(SPARK_RAPIDS_JNI)

project(
SPARK_RAPIDS_JNI
VERSION 24.12.00
VERSION 24.12.01
LANGUAGES C CXX CUDA
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/cudf
Open in desktop
Submodule cudf updated 736 files
2 changes: 1 addition & 1 deletion thirdparty/cudf-pins/rapids-cmake.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cb1a30c8f12923fe1f56b1948cb8b26d5676f6b9
549c67742295173f42978fdefe12412952f4a0b7
40 changes: 15 additions & 25 deletions thirdparty/cudf-pins/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" : "",
Expand All @@ -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" :
{
Expand All @@ -52,7 +42,7 @@
{
"always_download" : true,
"git_shallow" : false,
"git_tag" : "dc0f9fc20c2a544e53099e640a681b347532391a",
"git_tag" : "096346b739da3fb1d9c3b402190c0a3a7e554440",
"git_url" : "https://github.com/NVIDIA/cuCollections.git",
"version" : "0.0.1"
},
Expand Down Expand Up @@ -99,24 +89,16 @@
{
"always_download" : true,
"git_shallow" : false,
"git_tag" : "e2ff91954a2ebe3ee65e0a1568e9d77cb195164d",
"git_tag" : "58a0784fcda50403c6671cbee62fa1c133a586b4",
"git_url" : "https://github.com/rapidsai/kvikio.git",
"version" : "24.12"
"version" : "25.02"
},
"nanoarrow" :
{
"always_download" : true,
"git_shallow" : false,
"git_tag" : "1e2664a70ec14907409cadcceb14d79b9670bcdb",
"git_url" : "https://github.com/apache/arrow-nanoarrow.git",
"patches" :
[
{
"file" : "${current_json_dir}/../cudf/cpp/cmake/thirdparty/patches/nanoarrow_clang_tidy_compliance.diff",
"fixed_in" : "",
"issue" : "https://github.com/apache/arrow-nanoarrow/issues/537"
}
],
"version" : "0.6.0.dev"
},
"nvcomp" :
Expand Down Expand Up @@ -145,13 +127,21 @@
"git_url" : "https://github.com/NVIDIA/NVTX.git",
"version" : "3.1.0"
},
"rapids_logger" :
{
"always_download" : true,
"git_shallow" : false,
"git_tag" : "8968ab3337f31c845d4e3bf6c55ae89242ded22b",
"git_url" : "https://github.com/rapidsai/rapids-logger.git",
"version" : "0.1.0"
},
"rmm" :
{
"always_download" : true,
"git_shallow" : false,
"git_tag" : "b391ce867a62bbfc3283779d70231be5b00e2e84",
"git_tag" : "c1ccdadb7f3b2677fb3f0419342fb9946bfc5d08",
"git_url" : "https://github.com/rapidsai/rmm.git",
"version" : "24.12"
"version" : "25.02"
},
"spdlog" :
{
Expand Down
Loading