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

Merge commit '81749e6b637997156c481e7f1d74fd319ba7b1d4' into unity

Browse Source
This commit is contained in:
tqchen 2015-01-18 21:31:16 -08:00
commit c51e01da2f
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subtree/rabit/Makefile
View File

@ -3,7 +3,7 @@ export CXX = g++
export MPICXX = mpicxx export MPICXX = mpicxx
export LDFLAGS= -Llib export LDFLAGS= -Llib
export WARNFLAGS= -Wall -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -pedantic export WARNFLAGS= -Wall -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -pedantic
export CFLAGS = -O3 -msse2 -fPIC -Iinclude $(WARNFLAGS) export CFLAGS = -O3 -msse2 -fPIC $(WARNFLAGS)
# build path # build path
BPATH=. BPATH=.

4
subtree/rabit/src/allreduce_base.h
View File

@ -15,8 +15,8 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include "rabit/utils.h" #include "../include/rabit/utils.h"
#include "rabit/engine.h" #include "../include/rabit/engine.h"
#include "./socket.h" #include "./socket.h"
namespace MPI { namespace MPI {

2
subtree/rabit/src/allreduce_mock.h
View File

@ -8,8 +8,8 @@
#ifndef RABIT_ALLREDUCE_MOCK_H #ifndef RABIT_ALLREDUCE_MOCK_H
#define RABIT_ALLREDUCE_MOCK_H #define RABIT_ALLREDUCE_MOCK_H
#include <vector> #include <vector>
#include <rabit/engine.h>
#include <map> #include <map>
#include "../include/rabit/engine.h"
#include "./allreduce_robust.h" #include "./allreduce_robust.h"
namespace rabit { namespace rabit {

8
subtree/rabit/src/allreduce_robust.cc
View File

@ -10,10 +10,10 @@
#define NOMINMAX #define NOMINMAX
#include <limits> #include <limits>
#include <utility> #include <utility>
#include <rabit/io.h> #include "../include/rabit/io.h"
#include "rabit/utils.h" #include "../include/rabit/utils.h"
#include "rabit/engine.h" #include "../include/rabit/engine.h"
#include "rabit/rabit-inl.h" #include "../include/rabit/rabit-inl.h"
#include "./allreduce_robust.h" #include "./allreduce_robust.h"
namespace rabit { namespace rabit {

2
subtree/rabit/src/allreduce_robust.h
View File

@ -13,7 +13,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include "rabit/engine.h" #include "../include/rabit/engine.h"
#include "./allreduce_base.h" #include "./allreduce_base.h"
namespace rabit { namespace rabit {

2
subtree/rabit/src/engine.cc
View File

@ -10,7 +10,7 @@
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE
#define NOMINMAX #define NOMINMAX
#include <rabit/engine.h> #include "../include/rabit/engine.h"
#include "./allreduce_base.h" #include "./allreduce_base.h"
#include "./allreduce_robust.h" #include "./allreduce_robust.h"

2
subtree/rabit/src/engine_empty.cc
View File

@ -10,7 +10,7 @@
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE
#define NOMINMAX #define NOMINMAX
#include <rabit/engine.h> #include "../include/rabit/engine.h"
namespace rabit { namespace rabit {
namespace engine { namespace engine {

4
subtree/rabit/src/engine_mpi.cc
View File

@ -11,8 +11,8 @@
#define NOMINMAX #define NOMINMAX
#include <mpi.h> #include <mpi.h>
#include <cstdio> #include <cstdio>
#include "rabit/engine.h" #include "../include/rabit/engine.h"
#include "rabit/utils.h" #include "../include/rabit/utils.h"
namespace rabit { namespace rabit {
namespace engine { namespace engine {

2
subtree/rabit/src/socket.h
View File

@ -25,7 +25,7 @@
#endif #endif
#include <string> #include <string>
#include <cstring> #include <cstring>
#include "rabit/utils.h" #include "../include/rabit/utils.h"
#if defined(_WIN32) #if defined(_WIN32)
typedef int ssize_t; typedef int ssize_t;

2
subtree/rabit/wrapper/rabit_wrapper.cc
View File

@ -2,9 +2,9 @@
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE
#include <rabit.h>
#include <cstring> #include <cstring>
#include <string> #include <string>
#include "../include/rabit.h"
#include "./rabit_wrapper.h" #include "./rabit_wrapper.h"
namespace rabit { namespace rabit {
namespace wrapper { namespace wrapper {