Merge branch 'master' into sync-2024Jan24

src/data/array_interface.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2023 by XGBoost Contributors
+ * Copyright 2019-2024, XGBoost Contributors
  * \file array_interface.h
  * \brief View of __array_interface__
  */
@@ -12,7 +12,7 @@
 #include <limits>  // for numeric_limits
 #include <map>
 #include <string>
-#include <type_traits>  // std::alignment_of,std::remove_pointer_t
+#include <type_traits>  // for alignment_of, remove_pointer_t, invoke_result_t
 #include <utility>
 #include <vector>
 
@@ -645,7 +645,7 @@ auto DispatchDType(ArrayInterfaceHandler::Type dtype, Fn dispatch) {
     }
   }
 
-  return std::result_of_t<Fn(std::int8_t)>();
+  return std::invoke_result_t<Fn, std::int8_t>();
 }
 
 template <std::int32_t D, typename Fn>

src/data/device_adapter.cuh

@@ -261,12 +261,10 @@ bool NoInfInData(AdapterBatchT const& batch, IsValidFunctor is_valid) {
   auto counting = thrust::make_counting_iterator(0llu);
   auto value_iter = dh::MakeTransformIterator<bool>(counting, [=] XGBOOST_DEVICE(std::size_t idx) {
     auto v = batch.GetElement(idx).value;
-    if (!is_valid(v)) {
-      // discard the invalid elements.
-      return true;
+    if (is_valid(v) && isinf(v)) {
+      return false;
     }
-    // check that there's no inf in data.
-    return !std::isinf(v);
+    return true;
   });
   dh::XGBCachingDeviceAllocator<char> alloc;
   // The default implementation in thrust optimizes any_of/none_of/all_of by using small

src/data/ellpack_page.cu

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2023 by XGBoost contributors
+ * Copyright 2019-2024, XGBoost contributors
  */
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/transform_output_iterator.h>
@@ -13,7 +13,7 @@
 #include "../common/hist_util.cuh"
 #include "../common/transform_iterator.h"  // MakeIndexTransformIter
 #include "./ellpack_page.cuh"
-#include "device_adapter.cuh"  // for HasInfInData
+#include "device_adapter.cuh"  // for NoInfInData
 #include "ellpack_page.h"
 #include "gradient_index.h"
 #include "xgboost/data.h"

src/data/gradient_index.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2023, XGBoost Contributors
+ * Copyright 2017-2024, XGBoost Contributors
  * \brief Data type for fast histogram aggregation.
  */
 #include "gradient_index.h"
@@ -148,7 +148,8 @@ void GHistIndexMatrix::ResizeIndex(const size_t n_index, const bool isDense) {
       new_vec = {new_ptr, n_bytes / sizeof(std::uint8_t), malloc_resource};
     }
     this->data = std::move(new_vec);
-    this->index = common::Index{common::Span{data.data(), data.size()}, t_size};
+    this->index = common::Index{common::Span{data.data(), static_cast<size_t>(data.size())},
+        t_size};
   };
 
   if ((MaxNumBinPerFeat() - 1 <= static_cast<int>(std::numeric_limits<uint8_t>::max())) &&

src/data/gradient_index_format.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021-2023 XGBoost contributors
+ * Copyright 2021-2024 XGBoost contributors
  */
 #include <cstddef>      // for size_t
 #include <cstdint>      // for uint8_t
@@ -40,7 +40,9 @@ class GHistIndexRawFormat : public SparsePageFormat<GHistIndexMatrix> {
       return false;
     }
     // - index
-    page->index = common::Index{common::Span{page->data.data(), page->data.size()}, size_type};
+    page->index =
+        common::Index{common::Span{page->data.data(), static_cast<size_t>(page->data.size())},
+            size_type};
 
     // hit count
     if (!common::ReadVec(fi, &page->hit_count)) {

src/data/proxy_dmatrix.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2023, XGBoost contributors
+ * Copyright 2020-2024, XGBoost contributors
  */
 #ifndef XGBOOST_DATA_PROXY_DMATRIX_H_
 #define XGBOOST_DATA_PROXY_DMATRIX_H_
@@ -7,6 +7,7 @@
 #include <any>  // for any, any_cast
 #include <memory>
 #include <string>
+#include <type_traits>  // for invoke_result_t
 #include <utility>
 
 #include "adapter.h"
@@ -171,10 +172,10 @@ decltype(auto) HostAdapterDispatch(DMatrixProxy const* proxy, Fn fn, bool* type_
       LOG(FATAL) << "Unknown type: " << proxy->Adapter().type().name();
     }
     if constexpr (get_value) {
-      return std::result_of_t<Fn(
-          decltype(std::declval<std::shared_ptr<ArrayAdapter>>()->Value()))>();
+      return std::invoke_result_t<
+          Fn, decltype(std::declval<std::shared_ptr<ArrayAdapter>>()->Value())>();
     } else {
-      return std::result_of_t<Fn(decltype(std::declval<std::shared_ptr<ArrayAdapter>>()))>();
+      return std::invoke_result_t<Fn, decltype(std::declval<std::shared_ptr<ArrayAdapter>>())>();
     }
   }
 }

src/data/simple_dmatrix.cuh

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2023 by XGBoost Contributors
+ * Copyright 2019-2024, XGBoost Contributors
  * \file simple_dmatrix.cuh
  */
 #ifndef XGBOOST_DATA_SIMPLE_DMATRIX_CUH_
@@ -11,7 +11,7 @@
 
 #include "../common/device_helpers.cuh"
 #include "../common/error_msg.h"  // for InfInData
-#include "device_adapter.cuh"     // for HasInfInData
+#include "device_adapter.cuh"     // for NoInfInData
 
 namespace xgboost::data {