From f22ee7cb6167d86d4b4ea009a477f42c85c707b5 Mon Sep 17 00:00:00 2001 From: Tianqi Chen Date: Sun, 18 Jan 2015 22:54:01 -0800 Subject: [PATCH] windows changes --- Makefile | 12 ++++++------ R-package/src/Makevars.win | 2 +- src/learner/evaluation-inl.hpp | 8 ++++++-- src/tree/updater.cpp | 11 ++++++----- windows/xgboost/xgboost.vcxproj | 2 +- windows/xgboost_wrapper/xgboost_wrapper.vcxproj | 2 +- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index a41724291..45da278c0 100644 --- a/Makefile +++ b/Makefile @@ -41,13 +41,13 @@ wrapper/libxgboostwrapper.so: wrapper/xgboost_wrapper.cpp src/utils/*.h src/*.h # dependency on rabit 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 - 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 - 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 - cd subtree/rabit;make lib/librabit_mpi.a; cd - + cd subtree/rabit;make lib/librabit_mpi.a; cd ../.. $(BIN) : $(CXX) $(CFLAGS) -o $@ $(filter %.cpp %.o %.c %.cc %.a, $^) $(LDFLAGS) @@ -72,7 +72,7 @@ install: Rpack: make clean - cd subtree/rabit;make clean;cd - + cd subtree/rabit;make clean;cd .. rm -rf xgboost xgboost*.tar.gz cp -r R-package xgboost rm -rf xgboost/inst/examples/*.buffer @@ -96,4 +96,4 @@ Rpack: clean: $(RM) $(OBJ) $(BIN) $(MPIBIN) $(MPIOBJ) $(SLIB) *.o */*.o */*/*.o *~ */*~ */*/*~ - cd subtree/rabit; make clean; cd - + cd subtree/rabit; make clean; cd .. diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win index 0ae038561..cc933f099 100644 --- a/R-package/src/Makevars.win +++ b/R-package/src/Makevars.win @@ -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_CXXFLAGS= $(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 diff --git a/src/learner/evaluation-inl.hpp b/src/learner/evaluation-inl.hpp index b45e5fd85..60a8da8f1 100644 --- a/src/learner/evaluation-inl.hpp +++ b/src/learner/evaluation-inl.hpp @@ -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(sum_auc); + dat[1] = static_cast(ngroup); // approximately estimate auc using mean rabit::Allreduce(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(sum_metric); + dat[1] = static_cast(ngroup); // approximately estimate auc using mean rabit::Allreduce(dat, 2); return dat[0] / dat[1]; diff --git a/src/tree/updater.cpp b/src/tree/updater.cpp index ca19b93b3..53b3d6aa1 100644 --- a/src/tree/updater.cpp +++ b/src/tree/updater.cpp @@ -3,26 +3,27 @@ #define NOMINMAX #include #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(); if (!strcmp(name, "grow_colmaker")) return new ColMaker(); +#ifndef XGBOOST_STRICT_CXX98_ + if (!strcmp(name, "sync")) return new TreeSyncher(); if (!strcmp(name, "grow_histmaker")) return new CQHistMaker(); - //if (!strcmp(name, "grow_skmaker")) return new SketchMaker(); if (!strcmp(name, "distcol")) return new DistColMaker(); - +#endif utils::Error("unknown updater:%s", name); return NULL; } diff --git a/windows/xgboost/xgboost.vcxproj b/windows/xgboost/xgboost.vcxproj index ab6216d74..8cdd5b6a9 100644 --- a/windows/xgboost/xgboost.vcxproj +++ b/windows/xgboost/xgboost.vcxproj @@ -21,9 +21,9 @@ - + {19766C3F-7508-49D0-BAAC-0988FCC9970C} diff --git a/windows/xgboost_wrapper/xgboost_wrapper.vcxproj b/windows/xgboost_wrapper/xgboost_wrapper.vcxproj index e78c6e38c..ecd9ed719 100644 --- a/windows/xgboost_wrapper/xgboost_wrapper.vcxproj +++ b/windows/xgboost_wrapper/xgboost_wrapper.vcxproj @@ -21,8 +21,8 @@ - +