Unverified Commit bd10918e authored by Nikita Titov's avatar Nikita Titov Committed by GitHub
Browse files

fixed cpplint errors and disable warning only for VS (#2888)

* fixed cpplint errors and disable warning only for VS

* wrap more pragma warning
parent 643dd7b9
......@@ -90,17 +90,22 @@ class BinMapper {
/*! \brief Get number of bins */
inline int num_bin() const { return num_bin_; }
/*! \brief Missing Type */
inline MissingType missing_type() const { return missing_type_; }
/*! \brief True if bin is trivial (contains only one bin) */
inline bool is_trivial() const { return is_trivial_; }
/*! \brief Sparsity of this bin ( num_zero_bins / num_data ) */
inline double sparse_rate() const { return sparse_rate_; }
/*!
* \brief Save binary data to file
* \param file File want to write
*/
void SaveBinaryToFile(const VirtualFileWriter* writer) const;
/*!
* \brief Mapping bin into feature value
* \param bin
......@@ -118,6 +123,7 @@ class BinMapper {
* \brief Get sizes in byte of this object
*/
size_t SizesInByte() const;
/*!
* \brief Mapping feature value into bin
* \param value
......@@ -250,7 +256,6 @@ class Bin {
*/
virtual void Push(int tid, data_size_t idx, uint32_t value) = 0;
virtual void CopySubrow(const Bin* full_bin, const data_size_t* used_indices, data_size_t num_used_indices) = 0;
/*!
* \brief Get bin iterator of this bin for specific feature
......@@ -353,8 +358,6 @@ class Bin {
int num_threshold, const data_size_t* data_indices, data_size_t cnt,
data_size_t* lte_indices, data_size_t* gt_indices) const = 0;
/*!
* \brief After pushed all feature data, call this could have better refactor for bin data
*/
......@@ -404,7 +407,6 @@ class MultiValBin {
int num_feature,
double estimate_element_per_row) const = 0;
virtual void CopySubcol(const MultiValBin* full_bin,
const std::vector<int>& used_feature_index,
const std::vector<uint32_t>& lower,
......@@ -431,14 +433,12 @@ class MultiValBin {
const score_t* hessians,
hist_t* out) const = 0;
virtual void ConstructHistogramOrdered(const data_size_t* data_indices,
data_size_t start, data_size_t end,
const score_t* ordered_gradients,
const score_t* ordered_hessians,
hist_t* out) const = 0;
virtual void FinishLoad() = 0;
virtual bool IsSparse() = 0;
......
......@@ -1050,7 +1050,9 @@ LIGHTGBM_C_EXPORT int LGBM_NetworkInitWithFunctions(int num_machines,
*/
static char* LastErrorMsg() { static THREAD_LOCAL char err_msg[512] = "Everything is fine"; return err_msg; }
#pragma warning(disable : 4996)
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#endif
/*!
* \brief Set string message of the last error.
* \param msg Error message
......
......@@ -537,7 +537,7 @@ class Dataset {
inline data_size_t Split(int feature, const uint32_t* threshold,
int num_threshold, bool default_left,
const data_size_t* data_indices,
const data_size_t* data_indices,
data_size_t cnt, data_size_t* lte_indices,
data_size_t* gt_indices) const {
const int group = feature2group_[feature];
......
......@@ -76,8 +76,10 @@ const int kAlignedSize = 32;
#define SIZE_ALIGNED(t) ((t) + kAlignedSize - 1) / kAlignedSize * kAlignedSize
// Refer to https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4127?view=vs-2019
#pragma warning(disable : 4127)
#ifdef _MSC_VER
#pragma warning(disable : 4127)
#endif
} // namespace LightGBM
#endif // LightGBM_META_H_
#endif // LightGBM_META_H_
......@@ -66,7 +66,7 @@ class ThreadExceptionHelper {
#else
#ifdef _MSC_VER
#pragma warning(disable: 4068) // disable unknown pragma warning
#pragma warning(disable : 4068) // disable unknown pragma warning
#endif
#ifdef __cplusplus
......
......@@ -1091,7 +1091,9 @@ int LGBM_DatasetGetFeatureNames(
API_END();
}
#pragma warning(disable : 4702)
#ifdef _MSC_VER
#pragma warning(disable : 4702)
#endif
int LGBM_DatasetFree(DatasetHandle handle) {
API_BEGIN();
delete reinterpret_cast<Dataset*>(handle);
......@@ -1226,7 +1228,9 @@ int LGBM_BoosterLoadModelFromString(
API_END();
}
#pragma warning(disable : 4702)
#ifdef _MSC_VER
#pragma warning(disable : 4702)
#endif
int LGBM_BoosterFree(BoosterHandle handle) {
API_BEGIN();
delete reinterpret_cast<Booster*>(handle);
......
......@@ -144,7 +144,6 @@ class FeatureHistogram {
template <bool USE_RAND, bool USE_MC, bool USE_L1, bool USE_MAX_OUTPUT>
void FuncForNumricalL2() {
#define TEMPLATE_PREFIX USE_RAND, USE_MC, USE_L1, USE_MAX_OUTPUT
#define LAMBDA_ARGUMENTS \
double sum_gradient, double sum_hessian, data_size_t num_data, \
......
......@@ -271,7 +271,9 @@ namespace LightGBM {
class GPUTreeLearner: public SerialTreeLearner {
public:
#pragma warning(disable : 4702)
#ifdef _MSC_VER
#pragma warning(disable : 4702)
#endif
explicit GPUTreeLearner(const Config* tree_config) : SerialTreeLearner(tree_config) {
Log::Fatal("GPU Tree Learner was not enabled in this build.\n"
"Please recompile with CMake option -DUSE_GPU=1");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment