Merge branch 'branch-24.06' into spark-rapids-examples-380

NVIDIA · May 24, 2024 · 91ab2fc · 91ab2fc
2 parents 4417205 + 18dd6d2
commit 91ab2fc
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -18,7 +18,7 @@ name: auto-merge HEAD to BASE
 on:
   pull_request_target:
     branches:
-    - branch-24.04
+    - branch-24.06
     types: [closed]
 
 jobs:
@@ -29,14 +29,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: branch-24.04 # force to fetch from latest upstream instead of PR ref
+          ref: branch-24.06 # force to fetch from latest upstream instead of PR ref
 
       - name: auto-merge job
         uses: ./.github/workflows/auto-merge
         env:
           OWNER: NVIDIA
           REPO_NAME: spark-rapids-examples
-          HEAD: branch-24.04
-          BASE: branch-24.06
+          HEAD: branch-24.06
+          BASE: branch-24.08
           AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR
 
diff --git a/examples/ML+DL-Examples/Spark-cuML/pca/pom.xml b/examples/ML+DL-Examples/Spark-cuML/pca/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.nvidia</groupId>
     <artifactId>PCAExample</artifactId>
     <packaging>jar</packaging>
-    <version>24.04.0-SNAPSHOT</version>
+    <version>24.06.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/examples/UDF-Examples/RAPIDS-accelerated-UDFs/pom.xml b/examples/UDF-Examples/RAPIDS-accelerated-UDFs/pom.xml
@@ -25,7 +25,7 @@
         user defined functions for use with the RAPIDS Accelerator
         for Apache Spark
     </description>
-    <version>24.04.0-SNAPSHOT</version>
+    <version>24.06.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/examples/UDF-Examples/RAPIDS-accelerated-UDFs/src/main/cpp/CMakeLists.txt b/examples/UDF-Examples/RAPIDS-accelerated-UDFs/src/main/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
 
-file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.04/RAPIDS.cmake
+file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.06/RAPIDS.cmake
      ${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 
@@ -32,7 +32,7 @@ if(DEFINED GPU_ARCHS)
 endif()
 rapids_cuda_init_architectures(UDFEXAMPLESJNI)
 
-project(UDFEXAMPLESJNI VERSION 24.04.0 LANGUAGES C CXX CUDA)
+project(UDFEXAMPLESJNI VERSION 24.06.0 LANGUAGES C CXX CUDA)
 
 option(PER_THREAD_DEFAULT_STREAM "Build with per-thread default stream" OFF)
 option(BUILD_UDF_BENCHMARKS "Build the benchmarks" OFF)
@@ -84,10 +84,10 @@ set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -w --expt-extended-lambda --expt-relax
 set(CUDA_USE_STATIC_CUDA_RUNTIME ON)
 
 rapids_cpm_init()
-rapids_cpm_find(cudf 24.04.00
+rapids_cpm_find(cudf 24.06.00
         CPM_ARGS
         GIT_REPOSITORY  https://github.com/rapidsai/cudf.git
-        GIT_TAG         branch-24.04
+        GIT_TAG         branch-24.06
         GIT_SHALLOW     TRUE
         SOURCE_SUBDIR   cpp
         OPTIONS         "BUILD_TESTS OFF"

diff --git a/examples/UDF-Examples/Spark-cuSpatial/pom.xml b/examples/UDF-Examples/Spark-cuSpatial/pom.xml
@@ -24,7 +24,7 @@
   <name>UDF of the cuSpatial case for the RAPIDS Accelerator</name>
   <description>The RAPIDS accelerated user defined function of the cuSpatial case
     for use with the RAPIDS Accelerator for Apache Spark</description>
-  <version>24.04.0-SNAPSHOT</version>
+  <version>24.06.0-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/examples/XGBoost-Examples/agaricus/notebooks/python/agaricus-gpu.ipynb b/examples/XGBoost-Examples/agaricus/notebooks/python/agaricus-gpu.ipynb
@@ -197,7 +197,7 @@
     "    \"tree_method\": \"gpu_hist\",\n",
     "    \"grow_policy\": \"depthwise\",\n",
     "    \"num_workers\": 1,\n",
-    "    \"use_gpu\": \"true\",\n",
+    "    \"device\": \"cuda\",\n",
     "}\n",
     "params['features_col'] = features\n",
     "params['label_col'] = label\n",

diff --git a/examples/XGBoost-Examples/mortgage/notebooks/python/MortgageETL+XGBoost.ipynb b/examples/XGBoost-Examples/mortgage/notebooks/python/MortgageETL+XGBoost.ipynb
@@ -933,7 +933,7 @@
     "    \"tree_method\": \"gpu_hist\",\n",
     "    \"grow_policy\": \"depthwise\",\n",
     "    \"num_workers\": 1,\n",
-    "    \"use_gpu\": \"true\",\n",
+    "    \"device\": \"cuda\",\n",
     "}\n",
     "params['features_col'] = features\n",
     "params['label_col'] = label\n",

diff --git a/examples/XGBoost-Examples/mortgage/notebooks/python/cv-mortgage-gpu.ipynb b/examples/XGBoost-Examples/mortgage/notebooks/python/cv-mortgage-gpu.ipynb
@@ -191,7 +191,7 @@
     "    \"tree_method\": \"gpu_hist\",\n",
     "    \"grow_policy\": \"depthwise\",\n",
     "    \"num_workers\": 1,\n",
-    "    \"use_gpu\": \"true\",\n",
+    "    \"device\": \"cuda\",\n",
     "}\n",
     "\n",
     "params['features_col'] = features\n",

diff --git a/examples/XGBoost-Examples/mortgage/notebooks/python/mortgage-gpu.ipynb b/examples/XGBoost-Examples/mortgage/notebooks/python/mortgage-gpu.ipynb
@@ -235,7 +235,7 @@
     "    \"tree_method\": \"gpu_hist\",\n",
     "    \"grow_policy\": \"depthwise\",\n",
     "    \"num_workers\": 1,\n",
-    "    \"use_gpu\": \"true\",\n",
+    "    \"device\": \"cuda\",\n",
     "}\n",
     "params['features_col'] = features\n",
     "params['label_col'] = label\n",

diff --git a/examples/XGBoost-Examples/pom.xml b/examples/XGBoost-Examples/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <encoding>UTF-8</encoding>
-        <xgboost.version>2.0.3</xgboost.version>
+        <xgboost.version>2.1.0-SNAPSHOT</xgboost.version>
         <spark.version>3.5.0</spark.version>
         <scala.version>2.12.8</scala.version>
         <scala.binary.version>2.12</scala.binary.version>

diff --git a/examples/XGBoost-Examples/taxi/notebooks/python/cv-taxi-gpu.ipynb b/examples/XGBoost-Examples/taxi/notebooks/python/cv-taxi-gpu.ipynb
@@ -182,7 +182,7 @@
     "    \"tree_method\": \"gpu_hist\",\n",
     "    \"grow_policy\": \"depthwise\",\n",
     "    \"num_workers\": 1,\n",
-    "    \"use_gpu\": \"true\",\n",
+    "    \"device\": \"cuda\",\n",
     "}\n",
     "params['features_col'] = features\n",
     "params['label_col'] = label\n",

diff --git a/examples/XGBoost-Examples/taxi/notebooks/python/taxi-gpu.ipynb b/examples/XGBoost-Examples/taxi/notebooks/python/taxi-gpu.ipynb
@@ -213,7 +213,7 @@
     "    \"tree_method\": \"gpu_hist\",\n",
     "    \"grow_policy\": \"depthwise\",\n",
     "    \"num_workers\": 1,\n",
-    "    \"use_gpu\": \"true\",\n",
+    "    \"device\": \"cuda\",\n",
     "}\n",
     "params['features_col'] = features\n",
     "params['label_col'] = label\n",

diff --git a/...es/XGBoost-Examples/utility/scala/src/com/nvidia/spark/examples/utility/XGBoostArgs.scala b/...es/XGBoost-Examples/utility/scala/src/com/nvidia/spark/examples/utility/XGBoostArgs.scala
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -202,7 +202,7 @@ class XGBoostArgs private[utility] (
 
     val hostIp = params.getOrElse("rabit_tracker_host", "").toString
     if (!hostIp.isEmpty) {
-      params ++ Map("tracker_conf" -> TrackerConf(0l, hostIp))
+      params ++ Map("tracker_conf" -> TrackerConf(0, hostIp))
     } else params
   }