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

try fix memleak when test data have more features than training

Browse Source
This commit is contained in:
tqchen 2015-02-10 21:49:29 -08:00
parent 292f4f0e0d
commit a16cbedfab
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gbm/gblinear-inl.hpp
View File

@ -159,7 +159,7 @@ class GBLinear : public IGradBooster {
} }
fo << "weight:\n"; fo << "weight:\n";
for (int i = 0; i < model.param.num_output_group; ++i) { for (int i = 0; i < model.param.num_output_group; ++i) {
for (int j = 0; j <model.param.num_feature; ++j) { for (unsigned j = 0; j <model.param.num_feature; ++j) {
fo << model[i][j] << std::endl; fo << model[i][j] << std::endl;
} }
} }
@ -173,6 +173,7 @@ class GBLinear : public IGradBooster {
for (int gid = 0; gid < model.param.num_output_group; ++gid) { for (int gid = 0; gid < model.param.num_output_group; ++gid) {
float psum = model.bias()[gid]; float psum = model.bias()[gid];
for (bst_uint i = 0; i < inst.length; ++i) { for (bst_uint i = 0; i < inst.length; ++i) {
if (inst[i].index >= model.param.num_feature) continue;
psum += inst[i].fvalue * model[inst[i].index][gid]; psum += inst[i].fvalue * model[inst[i].index][gid];
} }
preds[gid] = psum; preds[gid] = psum;
@ -229,7 +230,7 @@ class GBLinear : public IGradBooster {
// model parameter // model parameter
struct Param { struct Param {
// number of feature dimension // number of feature dimension
int num_feature; unsigned num_feature;
// number of output group // number of output group
int num_output_group; int num_output_group;
// reserved field // reserved field
@ -242,7 +243,7 @@ class GBLinear : public IGradBooster {
} }
inline void SetParam(const char *name, const char *val) { inline void SetParam(const char *name, const char *val) {
using namespace std; using namespace std;
if (!strcmp(name, "bst:num_feature")) num_feature = atoi(val); if (!strcmp(name, "bst:num_feature")) num_feature = static_cast<unsigned>(atoi(val));
if (!strcmp(name, "num_output_group")) num_output_group = atoi(val); if (!strcmp(name, "num_output_group")) num_output_group = atoi(val);
} }
}; };

2
src/tree/model.h
View File

@ -503,12 +503,14 @@ class RegTree: public TreeModel<bst_float, RTreeNodeStat>{
/*! \brief fill the vector with sparse vector */ /*! \brief fill the vector with sparse vector */
inline void Fill(const RowBatch::Inst &inst) { inline void Fill(const RowBatch::Inst &inst) {
for (bst_uint i = 0; i < inst.length; ++i) { for (bst_uint i = 0; i < inst.length; ++i) {
if (inst[i].index >= data.size()) continue;
data[inst[i].index].fvalue = inst[i].fvalue; data[inst[i].index].fvalue = inst[i].fvalue;
} }
} }
/*! \brief drop the trace after fill, must be called after fill */ /*! \brief drop the trace after fill, must be called after fill */
inline void Drop(const RowBatch::Inst &inst) { inline void Drop(const RowBatch::Inst &inst) {
for (bst_uint i = 0; i < inst.length; ++i) { for (bst_uint i = 0; i < inst.length; ++i) {
if (inst[i].index >= data.size()) continue;
data[inst[i].index].flag = -1; data[inst[i].index].flag = -1;
} }
} }