diff --git a/jvm-packages/xgboost4j-example/src/main/scala/ml/dmlc/xgboost4j/scala/example/spark/DistTrainWithSpark.scala b/jvm-packages/xgboost4j-example/src/main/scala/ml/dmlc/xgboost4j/scala/example/spark/DistTrainWithSpark.scala index ceec3d690..0c65ce59d 100644 --- a/jvm-packages/xgboost4j-example/src/main/scala/ml/dmlc/xgboost4j/scala/example/spark/DistTrainWithSpark.scala +++ b/jvm-packages/xgboost4j-example/src/main/scala/ml/dmlc/xgboost4j/scala/example/spark/DistTrainWithSpark.scala @@ -40,6 +40,6 @@ object DistTrainWithSpark { "objective" -> "binary:logistic").toMap val xgboostModel = XGBoost.train(trainRDD, paramMap, numRound) // save model to HDFS path - xgboostModel.saveModelToHadoop(outputModelPath) + xgboostModel.saveModelAsHadoopFile(outputModelPath) } } 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 d201a0cf8..a0551fba5 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 @@ -128,7 +128,8 @@ object XGBoost extends Serializable { * @param modelPath The path of the file representing the model * @return The loaded model */ - def loadModelFromHadoop(modelPath: String)(implicit sparkContext: SparkContext): XGBoostModel = { + def loadModelFromHadoopFile(modelPath: String)(implicit sparkContext: SparkContext): + XGBoostModel = { val path = new Path(modelPath) val dataInStream = path.getFileSystem(sparkContext.hadoopConfiguration).open(path) val xgBoostModel = new XGBoostModel(SXGBoost.loadModel(dataInStream)) diff --git a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostModel.scala b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostModel.scala index cbe562c8d..f577320b6 100644 --- a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostModel.scala +++ b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostModel.scala @@ -49,7 +49,7 @@ class XGBoostModel(booster: Booster)(implicit val sc: SparkContext) extends Seri * * @param modelPath The model path as in Hadoop path. */ - def saveModelToHadoop(modelPath: String): Unit = { + def saveModelToHadoopFile(modelPath: String): Unit = { val path = new Path(modelPath) val outputStream = path.getFileSystem(sc.hadoopConfiguration).create(path) booster.saveModel(outputStream) diff --git a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostSuite.scala b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostSuite.scala index 91a12530a..513d54cdf 100644 --- a/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostSuite.scala +++ b/jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostSuite.scala @@ -150,8 +150,8 @@ class XGBoostSuite extends FunSuite with BeforeAndAfter { "objective" -> "binary:logistic").toMap val xgBoostModel = XGBoost.train(trainingRDD, paramMap, 5) assert(eval.eval(xgBoostModel.predict(testSetDMatrix), testSetDMatrix) < 0.1) - xgBoostModel.saveModelToHadoop(tempFile.toFile.getAbsolutePath) - val loadedXGBooostModel = XGBoost.loadModelFromHadoop(tempFile.toFile.getAbsolutePath) + xgBoostModel.saveModelAsHadoopFile(tempFile.toFile.getAbsolutePath) + val loadedXGBooostModel = XGBoost.loadModelFromHadoopFile(tempFile.toFile.getAbsolutePath) val predicts = loadedXGBooostModel.predict(testSetDMatrix) assert(eval.eval(predicts, testSetDMatrix) < 0.1) }