Merge branch 'branch-24.10' into hash-occupancy-jni

NVIDIA · Jul 26, 2024 · 22b2654 · 22b2654
2 parents a2be671 + e8d8868
commit 22b2654
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "thirdparty/cudf"]
 	path = thirdparty/cudf
 	url = https://github.com/rapidsai/cudf.git
-	branch = branch-24.08
+	branch = branch-24.10
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -165,7 +165,7 @@ $ ./build/build-in-docker install ...
 ```
 
 Now cd to ~/repos/NVIDIA/spark-rapids and build with one of the options from
-[spark-rapids instructions](https://github.com/NVIDIA/spark-rapids/blob/branch-24.08/CONTRIBUTING.md#building-from-source).
+[spark-rapids instructions](https://github.com/NVIDIA/spark-rapids/blob/branch-24.10/CONTRIBUTING.md#building-from-source).
 
 ```bash
 $ ./build/buildall

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>com.nvidia</groupId>
   <artifactId>spark-rapids-jni</artifactId>
-  <version>24.08.0-SNAPSHOT</version>
+  <version>24.10.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>RAPIDS Accelerator JNI for Apache Spark</name>
   <description>

diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
@@ -51,7 +51,7 @@ rapids_cuda_init_architectures(SPARK_RAPIDS_JNI)
 
 project(
   SPARK_RAPIDS_JNI
-  VERSION 24.08.00
+  VERSION 24.10.00
   LANGUAGES C CXX CUDA
 )
 

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 @@
-1dbd2a9b006b7c798299002dd3e036a76cfbb8e9
+3cb2e5cad4932131a4958275f40e66bdcc4ab4a5
diff --git a/thirdparty/cudf-pins/versions.json b/thirdparty/cudf-pins/versions.json
@@ -52,9 +52,9 @@
     {
       "always_download" : true,
       "git_shallow" : false,
-      "git_tag" : "d0f34061dc80d3c600feede2390eca48bb340fb1",
+      "git_tag" : "06db0899659368a413cc6885553028274e945096",
       "git_url" : "https://github.com/rapidsai/kvikio.git",
-      "version" : "24.08"
+      "version" : "24.10"
     },
     "bs_thread_pool" : 
     {
@@ -150,9 +150,9 @@
     {
       "always_download" : true,
       "git_shallow" : false,
-      "git_tag" : "67a78d6370ed34a0ffcb3aa9c77299e2a7ea1ee5",
+      "git_tag" : "fd4af2f9846caa7771d7418f322965d63add0981",
       "git_url" : "https://github.com/rapidsai/rmm.git",
-      "version" : "24.08"
+      "version" : "24.10"
     },
     "spdlog" : 
     {