Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gbtree.cc

Browse Source
This commit is contained in:
amdsc21 2023-03-08 21:44:20 +01:00
parent 4c4e5af29c
commit 946f9e9802
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gbm/gbtree.cc
View File

@ -54,7 +54,7 @@ void GBTree::Configure(Args const& cfg) {
Predictor::Create("cpu_predictor", this->ctx_)); Predictor::Create("cpu_predictor", this->ctx_));
} }
cpu_predictor_->Configure(cfg); cpu_predictor_->Configure(cfg);
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
auto n_gpus = common::AllVisibleGPUs(); auto n_gpus = common::AllVisibleGPUs();
if (!gpu_predictor_ && n_gpus != 0) { if (!gpu_predictor_ && n_gpus != 0) {
gpu_predictor_ = std::unique_ptr<Predictor>( gpu_predictor_ = std::unique_ptr<Predictor>(
@ -63,7 +63,7 @@ void GBTree::Configure(Args const& cfg) {
if (n_gpus != 0) { if (n_gpus != 0) {
gpu_predictor_->Configure(cfg); gpu_predictor_->Configure(cfg);
} }
#endif // defined(XGBOOST_USE_CUDA) #endif // defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
#if defined(XGBOOST_USE_ONEAPI) #if defined(XGBOOST_USE_ONEAPI)
if (!oneapi_predictor_) { if (!oneapi_predictor_) {
@ -194,7 +194,7 @@ void GBTree::ConfigureUpdaters() {
void GPUCopyGradient(HostDeviceVector<GradientPair> const*, bst_group_t, bst_group_t, void GPUCopyGradient(HostDeviceVector<GradientPair> const*, bst_group_t, bst_group_t,
HostDeviceVector<GradientPair>*) HostDeviceVector<GradientPair>*)
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
; // NOLINT ; // NOLINT
#else #else
{ {
@ -588,13 +588,13 @@ GBTree::GetPredictor(HostDeviceVector<float> const *out_pred,
CHECK(configured_); CHECK(configured_);
if (tparam_.predictor != PredictorType::kAuto) { if (tparam_.predictor != PredictorType::kAuto) {
if (tparam_.predictor == PredictorType::kGPUPredictor) { if (tparam_.predictor == PredictorType::kGPUPredictor) {
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
CHECK_GE(common::AllVisibleGPUs(), 1) << "No visible GPU is found for XGBoost."; CHECK_GE(common::AllVisibleGPUs(), 1) << "No visible GPU is found for XGBoost.";
CHECK(gpu_predictor_); CHECK(gpu_predictor_);
return gpu_predictor_; return gpu_predictor_;
#else #else
common::AssertGPUSupport(); common::AssertGPUSupport();
#endif // defined(XGBOOST_USE_CUDA) #endif // defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
} }
if (tparam_.predictor == PredictorType::kOneAPIPredictor) { if (tparam_.predictor == PredictorType::kOneAPIPredictor) {
#if defined(XGBOOST_USE_ONEAPI) #if defined(XGBOOST_USE_ONEAPI)
@ -619,15 +619,15 @@ GBTree::GetPredictor(HostDeviceVector<float> const *out_pred,
// Use GPU Predictor if data is already on device and gpu_id is set. // Use GPU Predictor if data is already on device and gpu_id is set.
if (on_device && ctx_->gpu_id >= 0) { if (on_device && ctx_->gpu_id >= 0) {
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
CHECK_GE(common::AllVisibleGPUs(), 1) << "No visible GPU is found for XGBoost."; CHECK_GE(common::AllVisibleGPUs(), 1) << "No visible GPU is found for XGBoost.";
CHECK(gpu_predictor_); CHECK(gpu_predictor_);
return gpu_predictor_; return gpu_predictor_;
#else #else
LOG(FATAL) << "Data is on CUDA device, but XGBoost is not compiled with " LOG(FATAL) << "Data is on CUDA device, but XGBoost is not compiled with "
"CUDA support."; "CUDA/HIP support.";
return cpu_predictor_; return cpu_predictor_;
#endif // defined(XGBOOST_USE_CUDA) #endif // defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
} }
// GPU_Hist by default has prediction cache calculated from quantile values, // GPU_Hist by default has prediction cache calculated from quantile values,
@ -645,14 +645,14 @@ GBTree::GetPredictor(HostDeviceVector<float> const *out_pred,
} }
if (tparam_.tree_method == TreeMethod::kGPUHist) { if (tparam_.tree_method == TreeMethod::kGPUHist) {
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
CHECK_GE(common::AllVisibleGPUs(), 1) << "No visible GPU is found for XGBoost."; CHECK_GE(common::AllVisibleGPUs(), 1) << "No visible GPU is found for XGBoost.";
CHECK(gpu_predictor_); CHECK(gpu_predictor_);
return gpu_predictor_; return gpu_predictor_;
#else #else
common::AssertGPUSupport(); common::AssertGPUSupport();
return cpu_predictor_; return cpu_predictor_;
#endif // defined(XGBOOST_USE_CUDA) #endif // defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
} }
CHECK(cpu_predictor_); CHECK(cpu_predictor_);
@ -667,7 +667,7 @@ GBTree::GetPredictor(HostDeviceVector<float> const *out_pred,
*/ */
void GPUDartPredictInc(common::Span<float>, common::Span<float>, float, size_t, bst_group_t, void GPUDartPredictInc(common::Span<float>, common::Span<float>, float, size_t, bst_group_t,
bst_group_t) bst_group_t)
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
; // NOLINT ; // NOLINT
#else #else
{ {
@ -679,7 +679,7 @@ void GPUDartInplacePredictInc(common::Span<float> /*out_predts*/, common::Span<f
float /*tree_w*/, size_t /*n_rows*/, float /*tree_w*/, size_t /*n_rows*/,
linalg::TensorView<float const, 1> /*base_score*/, linalg::TensorView<float const, 1> /*base_score*/,
bst_group_t /*n_groups*/, bst_group_t /*group*/) bst_group_t /*n_groups*/, bst_group_t /*group*/)
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
; // NOLINT ; // NOLINT
#else #else
{ {
@ -836,7 +836,7 @@ class Dart : public GBTree {
std::vector<Predictor const*> predictors { std::vector<Predictor const*> predictors {
cpu_predictor_.get(), cpu_predictor_.get(),
#if defined(XGBOOST_USE_CUDA) #if defined(XGBOOST_USE_CUDA) || defined(XGBOOST_USE_HIP)
gpu_predictor_.get() gpu_predictor_.get()
#endif // defined(XGBOOST_USE_CUDA) #endif // defined(XGBOOST_USE_CUDA)
}; };