pom change git didn't pick up (+5 squashed commits)

Squashed commits:
[6182244] One missed pom
[ab5bc5e] Update all the poms, even the unused ones
[a96c3b9] More clean-up
[aea9cd3] Further de-newification
[1539100] Cleaning up XGBoosterInplacePredict

Author: yoquinjo

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

@@ -332,9 +332,8 @@ 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);
   }
 
@@ -356,9 +355,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 +381,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 +408,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 +433,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 +448,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));
@@ -360,7 +356,7 @@ public void testBoosterInplacePredict() throws  XGBoostError, IOException {
 
     // Submit all the tasks
     for (int i=0; i<n_tasks; i++) {
-      result.add(executorService.submit(new InplacePredictionTask(i, booster, testX2, test_rows, features, testMat, predicts)));
+      result.add(executorService.submit(new InplacePredictionTask(i, booster, testX2, test_rows, features, predicts)));
     }
 
     // Tell the executor service we are done

src/c_api/c_api.cc

@@ -1077,35 +1077,45 @@ XGB_DLL int XGBoosterInplacePredict(BoosterHandle handle,
   API_BEGIN();
   CHECK_HANDLE();
   xgboost::bst_ulong out_dim;
+  std::shared_ptr<xgboost::data::DenseAdapter> x{new xgboost::data::DenseAdapter(data, num_rows, num_features)};
   //std::shared_ptr<DMatrix> p_m(dMatrixHandle);
   std::shared_ptr<DMatrix> p_m{nullptr};
-  if (!dMatrixHandle) {
+  /*if (!dMatrixHandle) {
     fprintf (stderr, "dMatrixHandle is null");
     exit(1);
-  }
+  }*/
   if (!dMatrixHandle) {
     p_m.reset(new data::DMatrixProxy);
-    fprintf (stdout, "dmatrix handle is null");
+    //fprintf (stdout, "dmatrix handle is null");
     if (!p_m) {
       fprintf (stderr, "p_m 1 is null");
       exit(1);
     }
   } else {
     p_m = *static_cast<std::shared_ptr<DMatrix> *>(dMatrixHandle);
-
-    fprintf (stdout, "dmatrix handle is not null");
+    //fprintf (stdout, "dmatrix handle is not null");
     if (!p_m) {
       fprintf (stderr, "p_m 2 is null");
       exit(1);
     }
   }
-  auto proxy = new std::shared_ptr<xgboost::DMatrix>(new xgboost::data::DMatrixProxy);
+  //fprintf (stdout, reinterpret_cast<const char *>(p_m.get()));
+  p_m.reset(new data::DMatrixProxy);
+  auto stuff = dynamic_cast<data::DMatrixProxy *>(p_m.get());
+  auto proxy = new std::shared_ptr<xgboost::data::DMatrixProxy>(new xgboost::data::DMatrixProxy);
+  //printf ("stuff is %s", typeid(stuff).name());
+  //printf ("proxy is %s", typeid(proxy).name());
   if (!proxy) {
-    fprintf (stderr, "proxy is null");
+    fprintf (stderr, "proxy is null line 1058");
     exit(1);
   }
+  if (!stuff) {
+      fprintf (stderr, "stuff is null line 1062");
+      exit(1);
+  }
   auto *learner = static_cast<xgboost::Learner *>(handle);
   auto iteration_end = GetIterationFromTreeLimit(ntree_limit, learner);
+  stuff->SetDenseData(data, num_rows, num_features);
   InplacePredictImplCore(p_m, learner, (xgboost::PredictionType)0, missing, num_rows, num_features,
                          0, iteration_end, true, len, &out_dim, out_result);
 //  printf("XGBoosterInplacePredict len = %u, dim = %u\n", **len, out_dim);

src/data/proxy_dmatrix.cc

@@ -15,6 +15,15 @@ void DMatrixProxy::SetArrayData(char const *c_interface) {
   this->ctx_.gpu_id = Context::kCpuId;
 }
 
+void DMatrixProxy::SetDenseData(const float *data, size_t num_rows,
+                                size_t num_features) {
+  std::shared_ptr<xgboost::data::DenseAdapter> adapter{new xgboost::data::DenseAdapter(data, num_rows, num_features)};
+  this->batch_ = adapter;
+  this->Info().num_col_ = adapter->NumColumns();
+  this->Info().num_row_ = adapter->NumRows();
+  this->ctx_.gpu_id = Context::kCpuId;
+}
+
 void DMatrixProxy::SetCSRData(char const *c_indptr, char const *c_indices,
                               char const *c_values, bst_feature_t n_features, bool on_host) {
   CHECK(on_host) << "Not implemented on device.";

src/data/proxy_dmatrix.h

@@ -63,8 +63,11 @@ class DMatrixProxy : public DMatrix {
   }
 
   void SetArrayData(char const* c_interface);
-  void SetCSRData(char const* c_indptr, char const* c_indices, char const* c_values,
-                  bst_feature_t n_features, bool on_host);
+  void SetDenseData(const float *data,size_t num_rows,
+                    size_t num_features);
+  void SetCSRData(char const *c_indptr, char const *c_indices,
+                  char const *c_values, bst_feature_t n_features,
+                  bool on_host);
 
   MetaInfo& Info() override { return info_; }
   MetaInfo const& Info() const override { return info_; }

src/predictor/cpu_predictor.cc

@@ -707,11 +707,9 @@ class CPUPredictor : public Predictor {
   bool InplacePredict(std::shared_ptr<DMatrix> p_m, const gbm::GBTreeModel &model, float missing,
                       PredictionCacheEntry *out_preds, uint32_t tree_begin,
                       unsigned tree_end) const override {
+    //fprintf (stdout, "We are in cpu_predictor");
     auto proxy = dynamic_cast<data::DMatrixProxy *>(p_m.get());
-    if (!proxy) {
-      fprintf (stderr, "InplacePredict: proxy is null cpu variant");
-      exit(1);
-    }
+    //auto proxy = new std::shared_ptr<xgboost::DMatrix>(new xgboost::data::DMatrixProxy);
     auto x = proxy->Adapter();
     if (x.type() == typeid(std::shared_ptr<data::DenseAdapter>)) {
       this->DispatchedInplacePredict<data::DenseAdapter, kBlockOfRowsSize>(