fix.

dmlc · Mar 23, 2023 · 4efea19 · 4efea19
1 parent 76c8615
commit 4efea19
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/tree/updater_quantile_hist.cc b/src/tree/updater_quantile_hist.cc
@@ -421,13 +421,8 @@ class HistBuilder {
          * Specialized code for dense data: For dense data (with no missing value), the sum
          * of gradient histogram is equal to snode[nid]
          */
-<<<<<<< HEAD
-        auto const &gmat = *(p_fmat->GetBatches<GHistIndexMatrix>(HistBatch(param_)).begin());
-        std::vector<std::uint32_t> const &row_ptr = gmat.cut.Ptrs();
-=======
         auto const &gmat = *(p_fmat->GetBatches<GHistIndexMatrix>(ctx_, HistBatch(param_)).begin());
-        std::vector<uint32_t> const &row_ptr = gmat.cut.Ptrs();
->>>>>>> c19ca41cc (Use Booster context in DMatrix.)
+        std::vector<std::uint32_t> const &row_ptr = gmat.cut.Ptrs();
         CHECK_GE(row_ptr.size(), 2);
         std::uint32_t const ibegin = row_ptr[0];
         std::uint32_t const iend = row_ptr[1];