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

windows changes

Browse Source
This commit is contained in:
Tianqi Chen
2015-01-18 22:54:01 -08:00
parent 7780bc45c2
commit f22ee7cb61
6 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/learner/evaluation-inl.hpp
View File

@@ -313,7 +313,9 @@ struct EvalAuc : public IEvaluator {
}
}
if (distributed) {
float dat[2]; dat[0] = sum_auc; dat[1] = ngroup;
float dat[2];
dat[0] = static_cast<float>(sum_auc);
dat[1] = static_cast<float>(ngroup);
// approximately estimate auc using mean
rabit::Allreduce<rabit::op::Sum>(dat, 2);
return dat[0] / dat[1];
@@ -357,7 +359,9 @@ struct EvalRankList : public IEvaluator {
}
}
if (distributed) {
float dat[2]; dat[0] = sum_metric; dat[1] = ngroup;
float dat[2];
dat[0] = static_cast<float>(sum_metric);
dat[1] = static_cast<float>(ngroup);
// approximately estimate auc using mean
rabit::Allreduce<rabit::op::Sum>(dat, 2);
return dat[0] / dat[1];

11
src/tree/updater.cpp
View File

@@ -3,26 +3,27 @@
#define NOMINMAX
#include <cstring>
#include "./updater.h"
#include "./updater_sync-inl.hpp"
#include "./updater_prune-inl.hpp"
#include "./updater_refresh-inl.hpp"
#include "./updater_colmaker-inl.hpp"
#ifndef XGBOOST_STRICT_CXX98_
#include "./updater_sync-inl.hpp"
#include "./updater_distcol-inl.hpp"
#include "./updater_histmaker-inl.hpp"
//#include "./updater_skmaker-inl.hpp"
#endif
namespace xgboost {
namespace tree {
IUpdater* CreateUpdater(const char *name) {
using namespace std;
if (!strcmp(name, "prune")) return new TreePruner();
if (!strcmp(name, "sync")) return new TreeSyncher();
if (!strcmp(name, "refresh")) return new TreeRefresher<GradStats>();
if (!strcmp(name, "grow_colmaker")) return new ColMaker<GradStats>();
#ifndef XGBOOST_STRICT_CXX98_
if (!strcmp(name, "sync")) return new TreeSyncher();
if (!strcmp(name, "grow_histmaker")) return new CQHistMaker<GradStats>();
//if (!strcmp(name, "grow_skmaker")) return new SketchMaker();
if (!strcmp(name, "distcol")) return new DistColMaker<GradStats>();
#endif
utils::Error("unknown updater:%s", name);
return NULL;
}