From b4569a3cd49791717009fe574a2d63ea0899719a Mon Sep 17 00:00:00 2001 From: fis Date: Sun, 14 Nov 2021 23:50:18 +0800 Subject: [PATCH] Fix typo. --- include/xgboost/data.h | 2 +- src/data/data.cc | 22 +++++++++++----------- src/data/data.cu | 4 ++-- src/tree/hist/evaluate_splits.h | 2 +- src/tree/updater_colmaker.cc | 3 +-- src/tree/updater_gpu_hist.cu | 2 +- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/include/xgboost/data.h b/include/xgboost/data.h index cd000e371332..1678f4b1f4f1 100644 --- a/include/xgboost/data.h +++ b/include/xgboost/data.h @@ -93,7 +93,7 @@ class MetaInfo { * \brief Weight of each feature, used to define the probability of each feature being * selected when using column sampling. */ - HostDeviceVector feature_weigths; + HostDeviceVector feature_weights; /*! \brief default constructor */ MetaInfo() = default; diff --git a/src/data/data.cc b/src/data/data.cc index 91526429e3b8..acf6e47b9d21 100644 --- a/src/data/data.cc +++ b/src/data/data.cc @@ -297,8 +297,8 @@ MetaInfo MetaInfo::Slice(common::Span ridxs) const { out.base_margin_.HostVector() = Gather(this->base_margin_.HostVector(), ridxs); } - out.feature_weigths.Resize(this->feature_weigths.Size()); - out.feature_weigths.Copy(this->feature_weigths); + out.feature_weights.Resize(this->feature_weights.Size()); + out.feature_weights.Copy(this->feature_weights); out.feature_names = this->feature_names; out.feature_types.Resize(this->feature_types.Size()); @@ -431,7 +431,7 @@ void MetaInfo::SetInfo(const char* key, const void* dptr, DataType dtype, size_t DISPATCH_CONST_PTR(dtype, dptr, cast_dptr, std::copy(cast_dptr, cast_dptr + num, labels.begin())); } else if (!std::strcmp(key, "feature_weights")) { - auto &h_feature_weights = feature_weigths.HostVector(); + auto &h_feature_weights = feature_weights.HostVector(); h_feature_weights.resize(num); DISPATCH_CONST_PTR( dtype, dptr, cast_dptr, @@ -460,7 +460,7 @@ void MetaInfo::GetInfo(char const *key, bst_ulong *out_len, DataType dtype, } else if (!std::strcmp(key, "label_upper_bound")) { vec = &this->labels_upper_bound_.HostVector(); } else if (!std::strcmp(key, "feature_weights")) { - vec = &this->feature_weigths.HostVector(); + vec = &this->feature_weights.HostVector(); } else { LOG(FATAL) << "Unknown float field name: " << key; } @@ -566,10 +566,10 @@ void MetaInfo::Extend(MetaInfo const& that, bool accumulate_rows, bool check_col auto &h_feature_types = feature_types.HostVector(); LoadFeatureType(this->feature_type_names, &h_feature_types); } - if (!that.feature_weigths.Empty()) { - this->feature_weigths.Resize(that.feature_weigths.Size()); - this->feature_weigths.SetDevice(that.feature_weigths.DeviceIdx()); - this->feature_weigths.Copy(that.feature_weigths); + if (!that.feature_weights.Empty()) { + this->feature_weights.Resize(that.feature_weights.Size()); + this->feature_weights.SetDevice(that.feature_weights.DeviceIdx()); + this->feature_weights.Copy(that.feature_weights); } } @@ -612,10 +612,10 @@ void MetaInfo::Validate(int32_t device) const { check_device(labels_lower_bound_); return; } - if (feature_weigths.Size() != 0) { - CHECK_EQ(feature_weigths.Size(), num_col_) + if (feature_weights.Size() != 0) { + CHECK_EQ(feature_weights.Size(), num_col_) << "Size of feature_weights must equal to number of columns."; - check_device(feature_weigths); + check_device(feature_weights); } if (labels_upper_bound_.Size() != 0) { CHECK_EQ(labels_upper_bound_.Size(), num_row_) diff --git a/src/data/data.cu b/src/data/data.cu index c4c7c503cb2e..aee62d1b7fad 100644 --- a/src/data/data.cu +++ b/src/data/data.cu @@ -177,8 +177,8 @@ void MetaInfo::SetInfo(const char * c_key, std::string const& interface_str) { CopyInfoImpl(array_interface, &labels_upper_bound_); return; } else if (key == "feature_weights") { - CopyInfoImpl(array_interface, &feature_weigths); - auto d_feature_weights = feature_weigths.ConstDeviceSpan(); + CopyInfoImpl(array_interface, &feature_weights); + auto d_feature_weights = feature_weights.ConstDeviceSpan(); auto valid = thrust::none_of( thrust::device, d_feature_weights.data(), d_feature_weights.data() + d_feature_weights.size(), WeightsCheck{}); diff --git a/src/tree/hist/evaluate_splits.h b/src/tree/hist/evaluate_splits.h index e8e6f50d88b2..c183ad910676 100644 --- a/src/tree/hist/evaluate_splits.h +++ b/src/tree/hist/evaluate_splits.h @@ -375,7 +375,7 @@ template class HistEvaluator { n_threads_{n_threads}, task_{task} { interaction_constraints_.Configure(param, info.num_col_); - column_sampler_->Init(info.num_col_, info.feature_weigths.HostVector(), + column_sampler_->Init(info.num_col_, info.feature_weights.HostVector(), param_.colsample_bynode, param_.colsample_bylevel, param_.colsample_bytree, skip_0_index); } diff --git a/src/tree/updater_colmaker.cc b/src/tree/updater_colmaker.cc index 52fb85821543..1a24d6af9397 100644 --- a/src/tree/updater_colmaker.cc +++ b/src/tree/updater_colmaker.cc @@ -229,8 +229,7 @@ class ColMaker: public TreeUpdater { } } { - column_sampler_.Init(fmat.Info().num_col_, - fmat.Info().feature_weigths.ConstHostVector(), + column_sampler_.Init(fmat.Info().num_col_, fmat.Info().feature_weights.ConstHostVector(), param_.colsample_bynode, param_.colsample_bylevel, param_.colsample_bytree); } diff --git a/src/tree/updater_gpu_hist.cu b/src/tree/updater_gpu_hist.cu index d37227575986..9b673171fbbf 100644 --- a/src/tree/updater_gpu_hist.cu +++ b/src/tree/updater_gpu_hist.cu @@ -233,7 +233,7 @@ struct GPUHistMakerDevice { // thread safe void Reset(HostDeviceVector* dh_gpair, DMatrix* dmat, int64_t num_columns) { auto const& info = dmat->Info(); - this->column_sampler.Init(num_columns, info.feature_weigths.HostVector(), + this->column_sampler.Init(num_columns, info.feature_weights.HostVector(), param.colsample_bynode, param.colsample_bylevel, param.colsample_bytree); dh::safe_cuda(cudaSetDevice(device_id));