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

quick fix

Browse Source
This commit is contained in:
tqchen 2015-04-05 12:01:19 -07:00
parent 5f902982f2
commit fba9e5c714
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gbm/gbtree-inl.hpp
View File

@ -206,6 +206,10 @@ class GBTree : public IGradBooster {
for (size_t i = 0; i < trees.size(); ++i) { for (size_t i = 0; i < trees.size(); ++i) {
delete trees[i]; delete trees[i];
} }
for (size_t i = 0; i < updaters.size(); ++i) {
delete updaters[i];
}
updaters.clear();
trees.clear(); trees.clear();
pred_buffer.clear(); pred_buffer.clear();
pred_counter.clear(); pred_counter.clear();
@ -444,12 +448,12 @@ class GBTree : public IGradBooster {
int reserved[31]; int reserved[31];
/*! \brief constructor */ /*! \brief constructor */
ModelParam(void) { ModelParam(void) {
std::memset(this, 0, sizeof(ModelParam));
num_trees = 0; num_trees = 0;
num_roots = num_feature = 0; num_roots = num_feature = 0;
num_pbuffer = 0; num_pbuffer = 0;
num_output_group = 1; num_output_group = 1;
size_leaf_vector = 0; size_leaf_vector = 0;
std::memset(reserved, 0, sizeof(reserved));
} }
/*! /*!
* \brief set parameters from outside * \brief set parameters from outside

3
src/io/dmlc_simple.cpp
View File

@ -10,7 +10,8 @@ namespace xgboost {
namespace utils { namespace utils {
class SingleFileSplit : public dmlc::InputSplit { class SingleFileSplit : public dmlc::InputSplit {
public: public:
explicit SingleFileSplit(const char *fname) { explicit SingleFileSplit(const char *fname)
: use_stdin_(false) {
if (!std::strcmp(fname, "stdin")) { if (!std::strcmp(fname, "stdin")) {
#ifndef XGBOOST_STRICT_CXX98_ #ifndef XGBOOST_STRICT_CXX98_
use_stdin_ = true; fp_ = stdin; use_stdin_ = true; fp_ = stdin;

6
src/io/simple_fmatrix-inl.hpp
View File

@ -192,8 +192,10 @@ class FMatrixS : public IFMatrix{
bst_omp_uint ncol = static_cast<bst_omp_uint>(this->NumCol()); bst_omp_uint ncol = static_cast<bst_omp_uint>(this->NumCol());
#pragma omp parallel for schedule(static) #pragma omp parallel for schedule(static)
for (bst_omp_uint i = 0; i < ncol; ++i) { for (bst_omp_uint i = 0; i < ncol; ++i) {
std::sort(&col_data_[0] + col_ptr_[i], if (col_ptr_[i] < col_ptr_[i + 1]) {
&col_data_[0] + col_ptr_[i + 1], Entry::CmpValue); std::sort(BeginPtr(col_data_) + col_ptr_[i],
BeginPtr(col_data_) + col_ptr_[i + 1], Entry::CmpValue);
}
} }
} }