From 12ea137470d9ed3dd7518c9a5b507eb1ddc9b66d Mon Sep 17 00:00:00 2001
From: "Bobby Wang (SW-TEGRA)" <bobwang@nvidia.com>
Date: Mon, 18 Apr 2022 20:37:44 -0700
Subject: [PATCH 1/2] fix crossvalidator pyspark issue

---
 jvm-packages/pom.xml                                |  4 ++--
 jvm-packages/xgboost4j-spark/pom.xml                |  4 ++--
 .../src/main/resources/sparkxgb/rapids.py           | 13 +++++++++----
 jvm-packages/xgboost4j/pom.xml                      |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/jvm-packages/pom.xml b/jvm-packages/pom.xml
index 9b16b96d42ea..63ac9d1be7db 100644
--- a/jvm-packages/pom.xml
+++ b/jvm-packages/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.nvidia</groupId>
     <artifactId>xgboost-jvm_3.0</artifactId>
-    <version>1.4.2-0.2.0</version>
+    <version>1.4.2-0.3.0</version>
     <packaging>pom</packaging>
     <name>XGBoost JVM Package</name>
     <description>JVM Package for XGBoost</description>
@@ -38,7 +38,7 @@
         <scala.version>2.12.8</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
         <hadoop.version>2.7.3</hadoop.version>
-        <cudf.version>21.10.0</cudf.version>
+        <cudf.version>22.04.0</cudf.version>
         <cudf.classifier>cuda11</cudf.classifier>
         <maven.wagon.http.retryHandler.count>5</maven.wagon.http.retryHandler.count>
         <log.capi.invocation>OFF</log.capi.invocation>
diff --git a/jvm-packages/xgboost4j-spark/pom.xml b/jvm-packages/xgboost4j-spark/pom.xml
index 83dc0224e2a5..6e037436083e 100644
--- a/jvm-packages/xgboost4j-spark/pom.xml
+++ b/jvm-packages/xgboost4j-spark/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>xgboost-jvm_3.0</artifactId>
-        <version>1.4.2-0.2.0</version>
+        <version>1.4.2-0.3.0</version>
     </parent>
     <artifactId>xgboost4j-spark_3.0</artifactId>
     <build>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
             <artifactId>xgboost4j_3.0</artifactId>
-            <version>1.4.2-0.2.0</version>
+            <version>1.4.2-0.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
diff --git a/jvm-packages/xgboost4j-spark/src/main/resources/sparkxgb/rapids.py b/jvm-packages/xgboost4j-spark/src/main/resources/sparkxgb/rapids.py
index ca55c1ef5f58..6eada1a76560 100644
--- a/jvm-packages/xgboost4j-spark/src/main/resources/sparkxgb/rapids.py
+++ b/jvm-packages/xgboost4j-spark/src/main/resources/sparkxgb/rapids.py
@@ -26,10 +26,15 @@ def __init__(self):
             'ml.dmlc.xgboost4j.scala.spark.rapids.CrossValidator')
 
     def fit(self, dataset):
-        java_estimator, java_epms, java_evaluator = self._to_java_impl()
-        self._java_obj.setEstimator(java_estimator)
-        self._java_obj.setEvaluator(java_evaluator)
-        self._java_obj.setEstimatorParamMaps(java_epms)
+        estimator, epms, evaluator = self._to_java_impl()
+
+        self._java_obj.setEstimatorParamMaps(epms)
+        self._java_obj.setEvaluator(evaluator)
+        self._java_obj.setEstimator(estimator)
+        self._java_obj.setSeed(self.getSeed())
+        self._java_obj.setNumFolds(self.getNumFolds())
+        self._java_obj.setParallelism(self.getParallelism())
+        self._java_obj.setCollectSubModels(self.getCollectSubModels())
 
         cv_java_model = self._java_obj.fit(dataset._jdf)
         cv_py_model = CrossValidatorModel._from_java(cv_java_model)
diff --git a/jvm-packages/xgboost4j/pom.xml b/jvm-packages/xgboost4j/pom.xml
index 4c65420cee5e..99353f3549e8 100644
--- a/jvm-packages/xgboost4j/pom.xml
+++ b/jvm-packages/xgboost4j/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>xgboost-jvm_3.0</artifactId>
-        <version>1.4.2-0.2.0</version>
+        <version>1.4.2-0.3.0</version>
     </parent>
     <artifactId>xgboost4j_3.0</artifactId>
-    <version>1.4.2-0.2.0</version>
+    <version>1.4.2-0.3.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

From f4bdff537e01fe810b3dd8558781dbf35de8baf3 Mon Sep 17 00:00:00 2001
From: Bobby Wang <wbo4958@gmail.com>
Date: Tue, 19 Apr 2022 13:30:22 +0800
Subject: [PATCH 2/2] dep cudf to 21.10.0

---
 jvm-packages/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jvm-packages/pom.xml b/jvm-packages/pom.xml
index 63ac9d1be7db..e611081b9208 100644
--- a/jvm-packages/pom.xml
+++ b/jvm-packages/pom.xml
@@ -38,7 +38,7 @@
         <scala.version>2.12.8</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
         <hadoop.version>2.7.3</hadoop.version>
-        <cudf.version>22.04.0</cudf.version>
+        <cudf.version>21.10.0</cudf.version>
         <cudf.classifier>cuda11</cudf.classifier>
         <maven.wagon.http.retryHandler.count>5</maven.wagon.http.retryHandler.count>
         <log.capi.invocation>OFF</log.capi.invocation>