From 2b01de6e8051afbc4e4ac3ea38f49611a853e420 Mon Sep 17 00:00:00 2001 From: fis Date: Wed, 5 Aug 2020 00:46:12 +0800 Subject: [PATCH 1/3] Test on rabit update. --- rabit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rabit b/rabit index 74bf00a5ab45..c61f69d0bc36 160000 --- a/rabit +++ b/rabit @@ -1 +1 @@ -Subproject commit 74bf00a5ab4594f1695a8ea960394ce89f4a44d0 +Subproject commit c61f69d0bc365dca9d61227b0b30f5b04f273a17 From bd5b663f1d38e8bc65ba61367e4bb9d6897620c9 Mon Sep 17 00:00:00 2001 From: fis Date: Wed, 5 Aug 2020 00:57:13 +0800 Subject: [PATCH 2/3] Remove parameter on JVM Packages. --- .../src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala | 2 -- .../ml/dmlc/xgboost4j/scala/spark/XGBoostClassifier.scala | 3 +-- .../scala/ml/dmlc/xgboost4j/scala/spark/XGBoostRegressor.scala | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) 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 index f1a6f13efde4..8cfdf7dba792 100644 --- 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 index b6b09ee64201..90cc454bd36a 100644 --- 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 @@ -303,8 +303,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 index d8c278d46a03..61867cff8fea 100644 --- 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 @@ -281,8 +281,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) } From 237f57d9efff335354f9b36ef010a9f9e2dfa00b Mon Sep 17 00:00:00 2001 From: fis Date: Fri, 7 Aug 2020 14:35:52 +0800 Subject: [PATCH 3/3] Use master branch. --- rabit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rabit b/rabit index c61f69d0bc36..4acdd7c6f68d 160000 --- a/rabit +++ b/rabit @@ -1 +1 @@ -Subproject commit c61f69d0bc365dca9d61227b0b30f5b04f273a17 +Subproject commit 4acdd7c6f68debe1c39ae07ca75466d74d194dd1