Revert "Remove raw pointer."

This reverts commit 3d5f319.
dmlc · Jul 14, 2021 · d8bbf8b · d8bbf8b
1 parent 3d5f319
commit d8bbf8b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/include/xgboost/data.h b/include/xgboost/data.h
@@ -403,6 +403,7 @@ template<typename T>
 class BatchIterator {
  public:
   using iterator_category = std::forward_iterator_tag;  // NOLINT
+  explicit BatchIterator(BatchIteratorImpl<T>* impl) { impl_.reset(impl); }
   explicit BatchIterator(std::shared_ptr<BatchIteratorImpl<T>> impl) { impl_ = impl; }
 
   BatchIterator &operator++() {

diff --git a/src/data/iterative_device_dmatrix.cu b/src/data/iterative_device_dmatrix.cu
@@ -162,8 +162,8 @@ void IterativeDeviceDMatrix::Initialize(DataIterHandle iter_handle, float missin
 
 BatchSet<EllpackPage> IterativeDeviceDMatrix::GetEllpackBatches(const BatchParam& param) {
   CHECK(page_);
-  auto begin_iter = BatchIterator<EllpackPage>(
-      std::make_shared<SimpleBatchIteratorImpl<EllpackPage>>(page_));
+  auto begin_iter =
+      BatchIterator<EllpackPage>(new SimpleBatchIteratorImpl<EllpackPage>(page_));
   return BatchSet<EllpackPage>(begin_iter);
 }
 }  // namespace data

diff --git a/src/data/iterative_device_dmatrix.h b/src/data/iterative_device_dmatrix.h
@@ -83,8 +83,8 @@ inline void IterativeDeviceDMatrix::Initialize(DataIterHandle iter, float missin
 }
 inline BatchSet<EllpackPage> IterativeDeviceDMatrix::GetEllpackBatches(const BatchParam& param) {
   common::AssertGPUSupport();
-  auto begin_iter = BatchIterator<EllpackPage>(
-      std::make_shared<SimpleBatchIteratorImpl<EllpackPage>>(page_));
+  auto begin_iter =
+      BatchIterator<EllpackPage>(new SimpleBatchIteratorImpl<EllpackPage>(page_));
   return BatchSet<EllpackPage>(BatchIterator<EllpackPage>(begin_iter));
 }
 #endif  // !defined(XGBOOST_USE_CUDA)

diff --git a/src/data/simple_dmatrix.cc b/src/data/simple_dmatrix.cc
@@ -48,7 +48,7 @@ DMatrix* SimpleDMatrix::Slice(common::Span<int32_t const> ridxs) {
 BatchSet<SparsePage> SimpleDMatrix::GetRowBatches() {
   // since csr is the default data structure so `source_` is always available.
   auto begin_iter = BatchIterator<SparsePage>(
-      std::make_shared<SimpleBatchIteratorImpl<SparsePage>>(sparse_page_));
+      new SimpleBatchIteratorImpl<SparsePage>(sparse_page_));
   return BatchSet<SparsePage>(begin_iter);
 }
 
@@ -57,8 +57,8 @@ BatchSet<CSCPage> SimpleDMatrix::GetColumnBatches() {
   if (!column_page_) {
     column_page_.reset(new CSCPage(sparse_page_->GetTranspose(info_.num_col_)));
   }
-  auto begin_iter = BatchIterator<CSCPage>(
-      std::make_shared<SimpleBatchIteratorImpl<CSCPage>>(column_page_));
+  auto begin_iter =
+      BatchIterator<CSCPage>(new SimpleBatchIteratorImpl<CSCPage>(column_page_));
   return BatchSet<CSCPage>(begin_iter);
 }
 
@@ -70,8 +70,7 @@ BatchSet<SortedCSCPage> SimpleDMatrix::GetSortedColumnBatches() {
     sorted_column_page_->SortRows();
   }
   auto begin_iter = BatchIterator<SortedCSCPage>(
-      std::make_shared<SimpleBatchIteratorImpl<SortedCSCPage>>(
-          sorted_column_page_));
+      new SimpleBatchIteratorImpl<SortedCSCPage>(sorted_column_page_));
   return BatchSet<SortedCSCPage>(begin_iter);
 }
 
@@ -86,8 +85,8 @@ BatchSet<EllpackPage> SimpleDMatrix::GetEllpackBatches(const BatchParam& param)
     ellpack_page_.reset(new EllpackPage(this, param));
     batch_param_ = param;
   }
-  auto begin_iter = BatchIterator<EllpackPage>(
-      std::make_shared<SimpleBatchIteratorImpl<EllpackPage>>(ellpack_page_));
+  auto begin_iter =
+      BatchIterator<EllpackPage>(new SimpleBatchIteratorImpl<EllpackPage>(ellpack_page_));
   return BatchSet<EllpackPage>(begin_iter);
 }
 
@@ -101,8 +100,7 @@ BatchSet<GHistIndexMatrix> SimpleDMatrix::GetGradientIndex(const BatchParam& par
     batch_param_ = param;
   }
   auto begin_iter = BatchIterator<GHistIndexMatrix>(
-      std::make_shared<SimpleBatchIteratorImpl<GHistIndexMatrix>>(
-          gradient_index_));
+      new SimpleBatchIteratorImpl<GHistIndexMatrix>(gradient_index_));
   return BatchSet<GHistIndexMatrix>(begin_iter);
 }
 

diff --git a/src/data/sparse_page_dmatrix.cc b/src/data/sparse_page_dmatrix.cc
@@ -132,8 +132,7 @@ BatchSet<GHistIndexMatrix> SparsePageDMatrix::GetGradientIndex(const BatchParam&
   }
   this->InitializeSparsePage();
   auto begin_iter = BatchIterator<GHistIndexMatrix>(
-      std::make_shared<SimpleBatchIteratorImpl<GHistIndexMatrix>>(
-          ghist_index_source_));
+      new SimpleBatchIteratorImpl<GHistIndexMatrix>(ghist_index_source_));
   return BatchSet<GHistIndexMatrix>(begin_iter);
 }