From ae969a0e69dfcc9bd6891c779c8c745ea01ef907 Mon Sep 17 00:00:00 2001 From: tqchen Date: Sat, 5 Mar 2016 09:53:46 -0800 Subject: [PATCH] [refactor] move java package to namespace java --- jvm-packages/checkstyle-suppressions.xml | 2 +- .../xgboost4j/{ => java}/demo/BasicWalkThrough.java | 12 ++++++------ .../{ => java}/demo/BoostFromPrediction.java | 10 +++++----- .../xgboost4j/{ => java}/demo/CrossValidation.java | 8 ++++---- .../xgboost4j/{ => java}/demo/CustomObjective.java | 5 ++--- .../ml/dmlc/xgboost4j/{ => java}/demo/DistTrain.java | 5 ++--- .../xgboost4j/{ => java}/demo/ExternalMemory.java | 10 +++++----- .../{ => java}/demo/GeneralizedLinearModel.java | 12 ++++++------ .../xgboost4j/{ => java}/demo/PredictFirstNtree.java | 12 ++++++------ .../{ => java}/demo/PredictLeafIndices.java | 10 +++++----- .../xgboost4j/{ => java}/demo/util/CustomEval.java | 8 ++++---- .../xgboost4j/{ => java}/demo/util/DataLoader.java | 2 +- .../main/scala/ml/dmlc/xgboost4j/flink/Test.scala | 3 +-- .../java/ml/dmlc/xgboost4j/{ => java}/Booster.java | 2 +- .../java/ml/dmlc/xgboost4j/{ => java}/DMatrix.java | 2 +- .../java/ml/dmlc/xgboost4j/{ => java}/DataBatch.java | 2 +- .../ml/dmlc/xgboost4j/{ => java}/IEvaluation.java | 2 +- .../ml/dmlc/xgboost4j/{ => java}/IObjective.java | 2 +- .../ml/dmlc/xgboost4j/{ => java}/JNIErrorHandle.java | 2 +- .../dmlc/xgboost4j/{ => java}/JavaBoosterImpl.java | 2 +- .../dmlc/xgboost4j/{ => java}/NativeLibLoader.java | 2 +- .../java/ml/dmlc/xgboost4j/{ => java}/Rabit.java | 2 +- .../ml/dmlc/xgboost4j/{ => java}/RabitTracker.java | 2 +- .../java/ml/dmlc/xgboost4j/{ => java}/XGBoost.java | 2 +- .../ml/dmlc/xgboost4j/{ => java}/XGBoostError.java | 2 +- .../ml/dmlc/xgboost4j/{ => java}/XgboostJNI.java | 2 +- .../main/scala/ml/dmlc/xgboost4j/scala/Booster.scala | 4 +--- .../main/scala/ml/dmlc/xgboost4j/scala/DMatrix.scala | 6 +++--- .../scala/ml/dmlc/xgboost4j/scala/EvalTrait.scala | 5 +++-- .../ml/dmlc/xgboost4j/scala/ObjectiveTrait.scala | 6 +++--- .../ml/dmlc/xgboost4j/scala/ScalaBoosterImpl.scala | 5 ++--- .../main/scala/ml/dmlc/xgboost4j/scala/XGBoost.scala | 2 -- .../dmlc/xgboost4j/{ => java}/BoosterImplTest.java | 3 ++- .../ml/dmlc/xgboost4j/{ => java}/DMatrixTest.java | 5 ++++- .../scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala | 1 - .../dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala | 2 +- 36 files changed, 80 insertions(+), 84 deletions(-) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/BasicWalkThrough.java (93%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/BoostFromPrediction.java (90%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/CrossValidation.java (90%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/CustomObjective.java (98%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/DistTrain.java (97%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/ExternalMemory.java (90%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/GeneralizedLinearModel.java (90%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/PredictFirstNtree.java (88%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/PredictLeafIndices.java (90%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/util/CustomEval.java (89%) rename jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/{ => java}/demo/util/DataLoader.java (98%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/Booster.java (99%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/DMatrix.java (99%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/DataBatch.java (97%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/IEvaluation.java (96%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/IObjective.java (97%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/JNIErrorHandle.java (97%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/JavaBoosterImpl.java (99%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/NativeLibLoader.java (99%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/Rabit.java (98%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/RabitTracker.java (99%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/XGBoost.java (99%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/XGBoostError.java (95%) rename jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/{ => java}/XgboostJNI.java (99%) rename jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/{ => java}/BoosterImplTest.java (98%) rename jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/{ => java}/DMatrixTest.java (96%) diff --git a/jvm-packages/checkstyle-suppressions.xml b/jvm-packages/checkstyle-suppressions.xml index 21550e139..da60508fc 100644 --- a/jvm-packages/checkstyle-suppressions.xml +++ b/jvm-packages/checkstyle-suppressions.xml @@ -29,5 +29,5 @@ + files="xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XgboostJNI.java"/> diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/BasicWalkThrough.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/BasicWalkThrough.java similarity index 93% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/BasicWalkThrough.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/BasicWalkThrough.java index af5dd8a86..b0de7d0e0 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/BasicWalkThrough.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/BasicWalkThrough.java @@ -13,18 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.HashMap; -import ml.dmlc.xgboost4j.Booster; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.XGBoost; -import ml.dmlc.xgboost4j.XGBoostError; -import ml.dmlc.xgboost4j.demo.util.DataLoader; +import ml.dmlc.xgboost4j.java.Booster; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.XGBoost; +import ml.dmlc.xgboost4j.java.XGBoostError; +import ml.dmlc.xgboost4j.java.demo.util.DataLoader; /** * a simple example of java wrapper for xgboost diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/BoostFromPrediction.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/BoostFromPrediction.java similarity index 90% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/BoostFromPrediction.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/BoostFromPrediction.java index 335efc2d7..5076892cb 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/BoostFromPrediction.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/BoostFromPrediction.java @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.util.HashMap; -import ml.dmlc.xgboost4j.Booster; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.XGBoost; -import ml.dmlc.xgboost4j.XGBoostError; +import ml.dmlc.xgboost4j.java.Booster; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.XGBoost; +import ml.dmlc.xgboost4j.java.XGBoostError; /** * example for start from a initial base prediction diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/CrossValidation.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/CrossValidation.java similarity index 90% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/CrossValidation.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/CrossValidation.java index c3e913fd2..8f467c8d3 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/CrossValidation.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/CrossValidation.java @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.io.IOException; import java.util.HashMap; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.XGBoost; -import ml.dmlc.xgboost4j.XGBoostError; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.XGBoost; +import ml.dmlc.xgboost4j.java.XGBoostError; /** * an example of cross validation diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/CustomObjective.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/CustomObjective.java similarity index 98% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/CustomObjective.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/CustomObjective.java index 1b7dd056b..8da76b08d 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/CustomObjective.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/CustomObjective.java @@ -13,17 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import ml.dmlc.xgboost4j.java.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import ml.dmlc.xgboost4j.*; - /** * an example user define objective and eval * NOTE: when you do customized loss function, the default prediction value is margin diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/DistTrain.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/DistTrain.java similarity index 97% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/DistTrain.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/DistTrain.java index fdbbc6599..fdc2c1cd8 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/DistTrain.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/DistTrain.java @@ -1,14 +1,13 @@ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import ml.dmlc.xgboost4j.java.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import ml.dmlc.xgboost4j.*; - /** * Distributed training example, used to quick test distributed training. diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/ExternalMemory.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/ExternalMemory.java similarity index 90% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/ExternalMemory.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/ExternalMemory.java index 095382953..e73eb058d 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/ExternalMemory.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/ExternalMemory.java @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.util.HashMap; -import ml.dmlc.xgboost4j.Booster; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.XGBoost; -import ml.dmlc.xgboost4j.XGBoostError; +import ml.dmlc.xgboost4j.java.Booster; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.XGBoost; +import ml.dmlc.xgboost4j.java.XGBoostError; /** * simple example for using external memory version diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/GeneralizedLinearModel.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/GeneralizedLinearModel.java similarity index 90% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/GeneralizedLinearModel.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/GeneralizedLinearModel.java index e2e36e351..4ec2fc1a2 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/GeneralizedLinearModel.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/GeneralizedLinearModel.java @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.util.HashMap; -import ml.dmlc.xgboost4j.Booster; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.XGBoost; -import ml.dmlc.xgboost4j.XGBoostError; -import ml.dmlc.xgboost4j.demo.util.CustomEval; +import ml.dmlc.xgboost4j.java.Booster; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.XGBoost; +import ml.dmlc.xgboost4j.java.XGBoostError; +import ml.dmlc.xgboost4j.java.demo.util.CustomEval; /** * this is an example of fit generalized linear model in xgboost diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/PredictFirstNtree.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/PredictFirstNtree.java similarity index 88% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/PredictFirstNtree.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/PredictFirstNtree.java index defa437d3..67a965d64 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/PredictFirstNtree.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/PredictFirstNtree.java @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.util.HashMap; -import ml.dmlc.xgboost4j.Booster; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.XGBoost; -import ml.dmlc.xgboost4j.XGBoostError; -import ml.dmlc.xgboost4j.demo.util.CustomEval; +import ml.dmlc.xgboost4j.java.Booster; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.XGBoost; +import ml.dmlc.xgboost4j.java.XGBoostError; +import ml.dmlc.xgboost4j.java.demo.util.CustomEval; /** * predict first ntree diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/PredictLeafIndices.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/PredictLeafIndices.java similarity index 90% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/PredictLeafIndices.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/PredictLeafIndices.java index d18987292..420f38111 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/PredictLeafIndices.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/PredictLeafIndices.java @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo; +package ml.dmlc.xgboost4j.java.demo; import java.util.Arrays; import java.util.HashMap; -import ml.dmlc.xgboost4j.Booster; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.XGBoost; -import ml.dmlc.xgboost4j.XGBoostError; +import ml.dmlc.xgboost4j.java.Booster; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.XGBoost; +import ml.dmlc.xgboost4j.java.XGBoostError; /** * predict leaf indices diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/util/CustomEval.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/util/CustomEval.java similarity index 89% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/util/CustomEval.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/util/CustomEval.java index 93650abd5..b698bf410 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/util/CustomEval.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/util/CustomEval.java @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo.util; +package ml.dmlc.xgboost4j.java.demo.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import ml.dmlc.xgboost4j.DMatrix; -import ml.dmlc.xgboost4j.IEvaluation; -import ml.dmlc.xgboost4j.XGBoostError; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.IEvaluation; +import ml.dmlc.xgboost4j.java.XGBoostError; /** * a util evaluation class for examples diff --git a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/util/DataLoader.java b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/util/DataLoader.java similarity index 98% rename from jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/util/DataLoader.java rename to jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/util/DataLoader.java index 818d61451..5aa456fad 100644 --- a/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/demo/util/DataLoader.java +++ b/jvm-packages/xgboost4j-demo/src/main/java/ml/dmlc/xgboost4j/java/demo/util/DataLoader.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j.demo.util; +package ml.dmlc.xgboost4j.java.demo.util; import java.io.*; import java.util.ArrayList; diff --git a/jvm-packages/xgboost4j-flink/src/main/scala/ml/dmlc/xgboost4j/flink/Test.scala b/jvm-packages/xgboost4j-flink/src/main/scala/ml/dmlc/xgboost4j/flink/Test.scala index 65de48277..15ecd7308 100644 --- a/jvm-packages/xgboost4j-flink/src/main/scala/ml/dmlc/xgboost4j/flink/Test.scala +++ b/jvm-packages/xgboost4j-flink/src/main/scala/ml/dmlc/xgboost4j/flink/Test.scala @@ -16,8 +16,7 @@ package ml.dmlc.xgboost4j.flink -import ml.dmlc.xgboost4j.Rabit -import ml.dmlc.xgboost4j.RabitTracker +import ml.dmlc.xgboost4j.java.{RabitTracker, Rabit} import ml.dmlc.xgboost4j.scala.Booster import ml.dmlc.xgboost4j.scala.DMatrix import ml.dmlc.xgboost4j.scala.XGBoost diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/Booster.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/Booster.java similarity index 99% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/Booster.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/Booster.java index 0707cff2d..e6e427900 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/Booster.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/Booster.java @@ -1,4 +1,4 @@ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.io.IOException; import java.io.Serializable; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/DMatrix.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/DMatrix.java similarity index 99% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/DMatrix.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/DMatrix.java index 99f55055e..d8e1aaf4d 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/DMatrix.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/DMatrix.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.io.IOException; import java.util.Iterator; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/DataBatch.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/DataBatch.java similarity index 97% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/DataBatch.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/DataBatch.java index 3fd2427b8..b4bbbe690 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/DataBatch.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/DataBatch.java @@ -1,4 +1,4 @@ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; /** * A mini-batch of data that can be converted to DMatrix. diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/IEvaluation.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/IEvaluation.java similarity index 96% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/IEvaluation.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/IEvaluation.java index 079cd057e..9c28fb0fd 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/IEvaluation.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/IEvaluation.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; /** * interface for customized evaluation diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/IObjective.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/IObjective.java similarity index 97% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/IObjective.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/IObjective.java index c95b18ff6..3ee1d5008 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/IObjective.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/IObjective.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.io.Serializable; import java.util.List; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/JNIErrorHandle.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/JNIErrorHandle.java similarity index 97% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/JNIErrorHandle.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/JNIErrorHandle.java index d3c63d0ee..7bd64c149 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/JNIErrorHandle.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/JNIErrorHandle.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.io.IOException; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/JavaBoosterImpl.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/JavaBoosterImpl.java similarity index 99% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/JavaBoosterImpl.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/JavaBoosterImpl.java index 2820f51b6..7e2ade607 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/JavaBoosterImpl.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/JavaBoosterImpl.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.io.*; import java.util.HashMap; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/NativeLibLoader.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/NativeLibLoader.java similarity index 99% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/NativeLibLoader.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/NativeLibLoader.java index 796eb28aa..199b9ae42 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/NativeLibLoader.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/NativeLibLoader.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.io.*; import java.lang.reflect.Field; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/Rabit.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/Rabit.java similarity index 98% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/Rabit.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/Rabit.java index c209a2f5a..ce4be04c5 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/Rabit.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/Rabit.java @@ -1,4 +1,4 @@ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.io.IOException; import java.util.Map; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/RabitTracker.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/RabitTracker.java similarity index 99% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/RabitTracker.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/RabitTracker.java index e6f1c8a24..762cff7bf 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/RabitTracker.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/RabitTracker.java @@ -1,4 +1,4 @@ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XGBoost.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XGBoost.java similarity index 99% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XGBoost.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XGBoost.java index 293ce6728..44b7425a2 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XGBoost.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XGBoost.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.util.*; diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XGBoostError.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XGBoostError.java similarity index 95% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XGBoostError.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XGBoostError.java index 1f62b22fc..7da5c176d 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XGBoostError.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XGBoostError.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; /** * custom error class for xgboost diff --git a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XgboostJNI.java b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XgboostJNI.java similarity index 99% rename from jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XgboostJNI.java rename to jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XgboostJNI.java index 922f8bc8e..9f6a15a9c 100644 --- a/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/XgboostJNI.java +++ b/jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/XgboostJNI.java @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; /** diff --git a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/Booster.scala b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/Booster.scala index 524a5aa92..88032a61a 100644 --- a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/Booster.scala +++ b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/Booster.scala @@ -18,11 +18,9 @@ package ml.dmlc.xgboost4j.scala import java.io.IOException +import ml.dmlc.xgboost4j.java.XGBoostError import scala.collection.mutable -import ml.dmlc.xgboost4j.XGBoostError - - trait Booster extends Serializable { diff --git a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/DMatrix.scala b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/DMatrix.scala index 8f3d73e2b..4ee8d04fe 100644 --- a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/DMatrix.scala +++ b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/DMatrix.scala @@ -18,7 +18,7 @@ package ml.dmlc.xgboost4j.scala import _root_.scala.collection.JavaConverters._ -import ml.dmlc.xgboost4j.{DMatrix => JDMatrix, DataBatch, XGBoostError} +import ml.dmlc.xgboost4j.java.{DMatrix => JDMatrix, DataBatch, XGBoostError} class DMatrix private[scala](private[scala] val jDMatrix: JDMatrix) { @@ -45,8 +45,8 @@ class DMatrix private[scala](private[scala] val jDMatrix: JDMatrix) { this(new JDMatrix(headers, indices, data, st)) } - private[xgboost4j] def this(dataBatch: DataBatch) { - this(new JDMatrix(List(dataBatch).asJava.iterator, null)) + private[xgboost4j] def this(dataBatches: Iterator[DataBatch]) { + this(new JDMatrix(dataBatches.asJava, null)) } /** diff --git a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/EvalTrait.scala b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/EvalTrait.scala index 5f4e85683..388005edc 100644 --- a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/EvalTrait.scala +++ b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/EvalTrait.scala @@ -16,7 +16,8 @@ package ml.dmlc.xgboost4j.scala -import ml.dmlc.xgboost4j.{DMatrix => JDMatrix, IEvaluation} +import ml.dmlc.xgboost4j.java +import ml.dmlc.xgboost4j.java.IEvaluation trait EvalTrait extends IEvaluation { @@ -36,7 +37,7 @@ trait EvalTrait extends IEvaluation { */ def eval(predicts: Array[Array[Float]], dmat: DMatrix): Float - private[scala] def eval(predicts: Array[Array[Float]], jdmat: JDMatrix): Float = { + private[scala] def eval(predicts: Array[Array[Float]], jdmat: java.DMatrix): Float = { eval(predicts, new DMatrix(jdmat)) } } diff --git a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ObjectiveTrait.scala b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ObjectiveTrait.scala index 8f7bb86f0..1b563f96d 100644 --- a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ObjectiveTrait.scala +++ b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ObjectiveTrait.scala @@ -16,10 +16,10 @@ package ml.dmlc.xgboost4j.scala +import ml.dmlc.xgboost4j.java +import ml.dmlc.xgboost4j.java.IObjective import scala.collection.JavaConverters._ -import ml.dmlc.xgboost4j.{DMatrix => JDMatrix, IObjective} - trait ObjectiveTrait extends IObjective { /** * user define objective function, return gradient and second order gradient @@ -30,7 +30,7 @@ trait ObjectiveTrait extends IObjective { */ def getGradient(predicts: Array[Array[Float]], dtrain: DMatrix): List[Array[Float]] - private[scala] def getGradient(predicts: Array[Array[Float]], dtrain: JDMatrix): + private[scala] def getGradient(predicts: Array[Array[Float]], dtrain: java.DMatrix): java.util.List[Array[Float]] = { getGradient(predicts, new DMatrix(dtrain)).asJava } diff --git a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImpl.scala b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImpl.scala index fab3c1b19..bdb2fb34c 100644 --- a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImpl.scala +++ b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImpl.scala @@ -16,12 +16,11 @@ package ml.dmlc.xgboost4j.scala +import ml.dmlc.xgboost4j.java import scala.collection.JavaConverters._ import scala.collection.mutable -import ml.dmlc.xgboost4j.{Booster => JBooster} - -private[scala] class ScalaBoosterImpl private[xgboost4j](booster: JBooster) extends Booster { +private[scala] class ScalaBoosterImpl private[xgboost4j](booster: java.Booster) extends Booster { override def setParam(key: String, value: String): Unit = { booster.setParam(key, value) diff --git a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/XGBoost.scala b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/XGBoost.scala index 8e15f8174..966784d18 100644 --- a/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/XGBoost.scala +++ b/jvm-packages/xgboost4j/src/main/scala/ml/dmlc/xgboost4j/scala/XGBoost.scala @@ -18,8 +18,6 @@ package ml.dmlc.xgboost4j.scala import scala.collection.JavaConverters._ -import ml.dmlc.xgboost4j.{XGBoost => JXGBoost} - object XGBoost { def train( diff --git a/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/BoosterImplTest.java b/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/java/BoosterImplTest.java similarity index 98% rename from jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/BoosterImplTest.java rename to jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/java/BoosterImplTest.java index 4a0dd8e16..1d81b5d6b 100644 --- a/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/BoosterImplTest.java +++ b/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/java/BoosterImplTest.java @@ -13,12 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.util.HashMap; import java.util.Map; import junit.framework.TestCase; +import ml.dmlc.xgboost4j.java.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; diff --git a/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/DMatrixTest.java b/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/java/DMatrixTest.java similarity index 96% rename from jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/DMatrixTest.java rename to jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/java/DMatrixTest.java index 6c8206940..056291ddf 100644 --- a/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/DMatrixTest.java +++ b/jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/java/DMatrixTest.java @@ -13,12 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ml.dmlc.xgboost4j; +package ml.dmlc.xgboost4j.java; import java.util.Arrays; import java.util.Random; import junit.framework.TestCase; +import ml.dmlc.xgboost4j.java.DMatrix; +import ml.dmlc.xgboost4j.java.DataBatch; +import ml.dmlc.xgboost4j.java.XGBoostError; import org.junit.Test; /** diff --git a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala index 64ec3e033..cf7494c98 100644 --- a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala +++ b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/DMatrixSuite.scala @@ -20,7 +20,6 @@ import java.util.Arrays import scala.util.Random -import ml.dmlc.xgboost4j.{DMatrix => JDMatrix} import org.scalatest.FunSuite class DMatrixSuite extends FunSuite { diff --git a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala index ab805a70c..520af35fd 100644 --- a/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala +++ b/jvm-packages/xgboost4j/src/test/scala/ml/dmlc/xgboost4j/scala/ScalaBoosterImplSuite.scala @@ -16,7 +16,7 @@ package ml.dmlc.xgboost4j.scala -import ml.dmlc.xgboost4j.XGBoostError +import ml.dmlc.xgboost4j.java.XGBoostError import org.apache.commons.logging.LogFactory import org.scalatest.FunSuite