Rabit update. (#5978)

trivialfis · web-flow · commit f93f1c03fcc5 · 2020-08-11T09:17:32.000+08:00
* Remove parameter on JVM Packages.
diff --git a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala
@@ -381,7 +381,6 @@ object XGBoost extends Serializable {
     val attempt = TaskContext.get().attemptNumber.toString
     rabitEnv.put("DMLC_TASK_ID", taskId)
     rabitEnv.put("DMLC_NUM_ATTEMPT", attempt)
-    rabitEnv.put("DMLC_WORKER_STOP_PROCESS_ON_ERROR", "false")
     val numRounds = xgbExecutionParam.numRounds
     val makeCheckpoint = xgbExecutionParam.checkpointParam.isDefined && taskId.toInt == 0
     try {
@@ -997,4 +996,3 @@ private[spark] class LabeledPointGroupIterator(base: Iterator[XGBLabeledPoint])
     group
   }
 }
-
diff --git a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostClassifier.scala b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostClassifier.scala
@@ -308,8 +308,7 @@ class XGBoostClassificationModel private[ml](
         private val batchIterImpl = rowIterator.grouped($(inferBatchSize)).flatMap { batchRow =>
           if (batchCnt == 0) {
             val rabitEnv = Array(
-              "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString,
-              "DMLC_WORKER_STOP_PROCESS_ON_ERROR" -> "false").toMap
+              "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString).toMap
             Rabit.init(rabitEnv.asJava)
           }
 
diff --git a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostRegressor.scala b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostRegressor.scala
@@ -286,8 +286,7 @@ class XGBoostRegressionModel private[ml] (
         private val batchIterImpl = rowIterator.grouped($(inferBatchSize)).flatMap { batchRow =>
           if (batchCnt == 0) {
             val rabitEnv = Array(
-              "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString,
-              "DMLC_WORKER_STOP_PROCESS_ON_ERROR" -> "false").toMap
+              "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString).toMap
             Rabit.init(rabitEnv.asJava)
           }
 
diff --git a/rabit b/rabit
@@ -1 +1 @@
-Subproject commit 74bf00a5ab4594f1695a8ea960394ce89f4a44d0
+Subproject commit 4acdd7c6f68debe1c39ae07ca75466d74d194dd1

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,6 @@ object XGBoost extends Serializable {`
`381`	`381`	`val attempt = TaskContext.get().attemptNumber.toString`
`382`	`382`	`rabitEnv.put("DMLC_TASK_ID", taskId)`
`383`	`383`	`rabitEnv.put("DMLC_NUM_ATTEMPT", attempt)`
`384`		`- rabitEnv.put("DMLC_WORKER_STOP_PROCESS_ON_ERROR", "false")`
`385`	`384`	`val numRounds = xgbExecutionParam.numRounds`
`386`	`385`	`val makeCheckpoint = xgbExecutionParam.checkpointParam.isDefined && taskId.toInt == 0`
`387`	`386`	`try {`
`@@ -997,4 +996,3 @@ private[spark] class LabeledPointGroupIterator(base: Iterator[XGBLabeledPoint])`
`997`	`996`	`group`
`998`	`997`	`}`
`999`	`998`	`}`
`1000`		`-`
Original file line number	Diff line number	Diff line change
`@@ -308,8 +308,7 @@ class XGBoostClassificationModel private[ml](`
`308`	`308`	`private val batchIterImpl = rowIterator.grouped($(inferBatchSize)).flatMap { batchRow =>`
`309`	`309`	`if (batchCnt == 0) {`
`310`	`310`	`val rabitEnv = Array(`
`311`		`- "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString,`
`312`		`- "DMLC_WORKER_STOP_PROCESS_ON_ERROR" -> "false").toMap`
	`311`	`+ "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString).toMap`
`313`	`312`	`Rabit.init(rabitEnv.asJava)`
`314`	`313`	`}`
`315`	`314`
Original file line number	Diff line number	Diff line change
`@@ -286,8 +286,7 @@ class XGBoostRegressionModel private[ml] (`
`286`	`286`	`private val batchIterImpl = rowIterator.grouped($(inferBatchSize)).flatMap { batchRow =>`
`287`	`287`	`if (batchCnt == 0) {`
`288`	`288`	`val rabitEnv = Array(`
`289`		`- "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString,`
`290`		`- "DMLC_WORKER_STOP_PROCESS_ON_ERROR" -> "false").toMap`
	`289`	`+ "DMLC_TASK_ID" -> TaskContext.getPartitionId().toString).toMap`
`291`	`290`	`Rabit.init(rabitEnv.asJava)`
`292`	`291`	`}`
`293`	`292`