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

Merge branch 'unity' of ssh://github.com/tqchen/xgboost into unity

Browse Source
This commit is contained in:
tqchen 2015-01-18 22:56:33 -08:00
commit 0b55fa6aff
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -41,13 +41,13 @@ wrapper/libxgboostwrapper.so: wrapper/xgboost_wrapper.cpp src/utils/*.h src/*.h
# dependency on rabit # dependency on rabit
subtree/rabit/lib/librabit.a: subtree/rabit/src/engine.cc subtree/rabit/lib/librabit.a: subtree/rabit/src/engine.cc
cd subtree/rabit;make lib/librabit.a; cd - cd subtree/rabit;make lib/librabit.a; cd ../..
subtree/rabit/lib/librabit_empty.a: subtree/rabit/src/engine_empty.cc subtree/rabit/lib/librabit_empty.a: subtree/rabit/src/engine_empty.cc
cd subtree/rabit;make lib/librabit_empty.a; cd - cd subtree/rabit;make lib/librabit_empty.a; cd ../..
subtree/rabit/lib/librabit_mock.a: subtree/rabit/src/engine_mock.cc subtree/rabit/lib/librabit_mock.a: subtree/rabit/src/engine_mock.cc
cd subtree/rabit;make lib/librabit_mock.a; cd - cd subtree/rabit;make lib/librabit_mock.a; cd ../..
subtree/rabit/lib/librabit_mpi.a: subtree/rabit/src/engine_mpi.cc subtree/rabit/lib/librabit_mpi.a: subtree/rabit/src/engine_mpi.cc
cd subtree/rabit;make lib/librabit_mpi.a; cd - cd subtree/rabit;make lib/librabit_mpi.a; cd ../..
$(BIN) : $(BIN) :
$(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc %.a, $^) $(LDFLAGS) $(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc %.a, $^) $(LDFLAGS)
@ -72,7 +72,7 @@ install:
Rpack: Rpack:
make clean make clean
cd subtree/rabit;make clean;cd - cd subtree/rabit;make clean;cd ..
rm -rf xgboost xgboost*.tar.gz rm -rf xgboost xgboost*.tar.gz
cp -r R-package xgboost cp -r R-package xgboost
rm -rf xgboost/inst/examples/*.buffer rm -rf xgboost/inst/examples/*.buffer
@ -96,4 +96,4 @@ Rpack:
clean: clean:
$(RM) $(OBJ) $(BIN) $(MPIBIN) $(MPIOBJ) $(SLIB) *.o */*.o */*/*.o *~ */*~ */*/*~ $(RM) $(OBJ) $(BIN) $(MPIBIN) $(MPIOBJ) $(SLIB) *.o */*.o */*/*.o *~ */*~ */*/*~
cd subtree/rabit; make clean; cd - cd subtree/rabit; make clean; cd ..

2
R-package/src/Makevars.win
View File

@ -4,4 +4,4 @@ PKGROOT=../../
PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_MSG_ -DXGBOOST_CUSTOMIZE_PRNG_ -DXGBOOST_STRICT_CXX98_ -DRABIT_CUSTOMIZE_MSG_ -DRABIT_STRICT_CXX98_ -I$(PKGROOT) PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_MSG_ -DXGBOOST_CUSTOMIZE_PRNG_ -DXGBOOST_STRICT_CXX98_ -DRABIT_CUSTOMIZE_MSG_ -DRABIT_STRICT_CXX98_ -I$(PKGROOT)
PKG_CXXFLAGS= $(SHLIB_OPENMP_CFLAGS) PKG_CXXFLAGS= $(SHLIB_OPENMP_CFLAGS)
PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CFLAGS)
OBJECTS= xgboost_R.o xgboost_assert.o $(PKGROOT)/wrapper/xgboost_wrapper.o $(PKGROOT)/src/io/io.o $(PKGROOT)/src/gbm/gbm.o $(PKGROOT)/src/tree/updater.o $(PKGROOT)/src/sync/sync_empty.o OBJECTS= xgboost_R.o xgboost_assert.o $(PKGROOT)/wrapper/xgboost_wrapper.o $(PKGROOT)/src/io/io.o $(PKGROOT)/src/gbm/gbm.o $(PKGROOT)/src/tree/updater.o $(PKGROOT)/subtree/rabit/src/engine_empty.o

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

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

11
src/tree/updater.cpp
View File

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

2
windows/xgboost/xgboost.vcxproj
View File

@ -21,9 +21,9 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\gbm\gbm.cpp" /> <ClCompile Include="..\..\src\gbm\gbm.cpp" />
<ClCompile Include="..\..\src\io\io.cpp" /> <ClCompile Include="..\..\src\io\io.cpp" />
<ClCompile Include="..\..\src\sync\sync_tcp.cpp" />
<ClCompile Include="..\..\src\tree\updater.cpp" /> <ClCompile Include="..\..\src\tree\updater.cpp" />
<ClCompile Include="..\..\src\xgboost_main.cpp" /> <ClCompile Include="..\..\src\xgboost_main.cpp" />
<ClCompile Include="..\..\subtree\rabit\src\engine_empty.cc" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{19766C3F-7508-49D0-BAAC-0988FCC9970C}</ProjectGuid> <ProjectGuid>{19766C3F-7508-49D0-BAAC-0988FCC9970C}</ProjectGuid>

2
windows/xgboost_wrapper/xgboost_wrapper.vcxproj
View File

@ -21,8 +21,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\gbm\gbm.cpp" /> <ClCompile Include="..\..\src\gbm\gbm.cpp" />
<ClCompile Include="..\..\src\io\io.cpp" /> <ClCompile Include="..\..\src\io\io.cpp" />
<ClCompile Include="..\..\src\sync\sync_tcp.cpp" />
<ClCompile Include="..\..\src\tree\updater.cpp" /> <ClCompile Include="..\..\src\tree\updater.cpp" />
<ClCompile Include="..\..\subtree\rabit\src\engine_empty.cc" />
<ClCompile Include="..\..\wrapper\xgboost_wrapper.cpp" /> <ClCompile Include="..\..\wrapper\xgboost_wrapper.cpp" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">