Remove need to pass DMatrix

Author: yoquinjo

jvm-packages/xgboost4j/src/main/java/ml/dmlc/xgboost4j/java/Booster.java

@@ -332,9 +332,9 @@ private synchronized float[][] predict(DMatrix data,
    */
   public float[][] inplace_predict(float[] data,
                                    int num_rows,
-                                   int num_features,
-                                   DMatrix d_matrix) throws XGBoostError {
-    return this.inplace_predict(data, num_rows, num_features, d_matrix,
+                                   int num_features) throws XGBoostError {
+    return this.inplace_predict(data, num_rows, num_features,
+                Float.NaN, false, 0, false, false);
                 Float.NaN, false, 0, false, false);
   }
 
@@ -356,9 +356,8 @@ public float[][] inplace_predict(float[] data,
   public float[][] inplace_predict(float[] data,
                                    int num_rows,
                                    int num_features,
-                                   DMatrix d_matrix,
                                    float missing) throws XGBoostError {
-    return this.inplace_predict(data, num_rows, num_features, d_matrix,
+    return this.inplace_predict(data, num_rows, num_features,
                 missing, false, 0, false, false);
   }
 
@@ -383,10 +382,9 @@ public float[][] inplace_predict(float[] data,
   public float[][] inplace_predict(float[] data,
                                    int num_rows,
                                    int num_features,
-                                   DMatrix d_matrix,
                                    float missing,
                                    boolean outputMargin) throws XGBoostError {
-    return this.inplace_predict(data, num_rows, num_features, d_matrix, missing,
+    return this.inplace_predict(data, num_rows, num_features, missing,
                        outputMargin, 0, false, false);
   }
 
@@ -411,11 +409,10 @@ public float[][] inplace_predict(float[] data,
   public float[][] inplace_predict(float[] data,
                                    int num_rows,
                                    int num_features,
-                                   DMatrix d_matrix,
                                    float missing,
                                    boolean outputMargin,
                                    int treeLimit) throws XGBoostError {
-    return this.inplace_predict(data, num_rows, num_features, d_matrix, missing,
+    return this.inplace_predict(data, num_rows, num_features, missing,
                                 outputMargin, treeLimit, false, false);
   }
 
@@ -437,7 +434,6 @@ public float[][] inplace_predict(float[] data,
   public float[][] inplace_predict(float[] data,
                                    int num_rows,
                                    int num_features,
-                                   DMatrix d_matrix,
                                    float missing,
                                    boolean outputMargin,
                                    int treeLimit,
@@ -453,10 +449,10 @@ public float[][] inplace_predict(float[] data,
     if (predContribs) {
       optionMask = 4;
     }
-
+    DMatrix d_mat = new DMatrix(data, num_rows, num_features, missing);
     float[][] rawPredicts = new float[1][];
     XGBoostJNI.checkCall(XGBoostJNI.XGBoosterInplacePredict(handle, data, num_rows, num_features,
-        d_matrix.getHandle(), missing,
+        d_mat.getHandle(), missing,
         optionMask, treeLimit, rawPredicts));  // pass missing and treelimit here?
 
     // System.out.println("Booster.inplace_predict rawPredicts[0].length = " +

jvm-packages/xgboost4j/src/test/java/ml/dmlc/xgboost4j/java/BoosterImplTest.java

@@ -95,18 +95,16 @@ class InplacePredictThread extends Thread {
   float[][] testX;
   int test_rows;
   int features;
-  DMatrix dMatrix;
   float[][] true_predicts;
   Booster booster;
   Random rng = new Random();
   int n_preds = 100;
 
-  public InplacePredictThread(int n, Booster booster, float[][] testX, int test_rows, int features, DMatrix dMatrix, float[][] true_predicts) {
+  public InplacePredictThread(int n, Booster booster, float[][] testX, int test_rows, int features, float[][] true_predicts) {
     this.thread_num = n;
     this.booster = booster;
     this.testX = testX;
     this.test_rows = test_rows;
-    this.dMatrix = dMatrix;
     this.features = features;
     this.true_predicts = true_predicts;
   }
@@ -122,7 +120,7 @@ public void run() {
         int r = this.rng.nextInt(this.test_rows);
 
         // In-place predict a single random row
-        float[][] predictions = booster.inplace_predict(this.testX[r], 1, this.features, this.dMatrix);
+        float[][] predictions = booster.inplace_predict(this.testX[r], 1, this.features);
 
         // Confirm results as expected
         if (predictions[0][0] != this.true_predicts[r][0]) {
@@ -146,19 +144,17 @@ class InplacePredictionTask implements Callable<Boolean> {
   float[][] testX;
   int test_rows;
   int features;
-  DMatrix dMatrix;
   float[][] true_predicts;
   Booster booster;
   Random rng = new Random();
   int n_preds = 100;
 
-  public InplacePredictionTask(int n, Booster booster, float[][] testX, int test_rows, int features, DMatrix dMatrix, float[][] true_predicts) {
+  public InplacePredictionTask(int n, Booster booster, float[][] testX, int test_rows, int features, float[][] true_predicts) {
     this.task_num = n;
     this.booster = booster;
     this.testX = testX;
     this.test_rows = test_rows;
     this.features = features;
-    this.dMatrix = dMatrix;
     this.true_predicts = true_predicts;
   }
 
@@ -172,7 +168,7 @@ public Boolean call() throws Exception {
       int r = this.rng.nextInt(this.test_rows);
 
       // In-place predict a single random row
-      float[][] predictions = booster.inplace_predict(this.testX[r], 1, this.features, this.dMatrix);
+      float[][] predictions = booster.inplace_predict(this.testX[r], 1, this.features);
 
       // Confirm results as expected
       if (predictions[0][0] != this.true_predicts[r][0]) {
@@ -335,7 +331,7 @@ public void testBoosterInplacePredict() throws  XGBoostError, IOException {
     float[][] predicts = booster.predict(testMat);
 
     // inplace prediction
-    float[][] inplace_predicts = booster.inplace_predict(testX, test_rows, features, testMat);
+    float[][] inplace_predicts = booster.inplace_predict(testX, test_rows, features);
 
     // Confirm that the two prediction results are identical
     TestCase.assertTrue(ArrayComparator.compare(predicts, inplace_predicts));