Merge commit '81749e6b637997156c481e7f1d74fd319ba7b1d4' into unity

2015-01-18 21:31:16 -08:00 · 2015-01-18 21:31:16 -08:00 · c51e01da2f
commit c51e01da2f
parent ba0b950a84 81749e6b63
10 changed files with 15 additions and 15 deletions
--- a/subtree/rabit/Makefile
+++ b/subtree/rabit/Makefile
@ -3,7 +3,7 @@ export CXX = g++
 export MPICXX = mpicxx
 export LDFLAGS= -Llib
 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
 BPATH=.
--- a/subtree/rabit/src/allreduce_base.h
+++ b/subtree/rabit/src/allreduce_base.h
@ -15,8 +15,8 @@
 #include <vector>
 #include <string>
 #include <algorithm>
-#include "rabit/utils.h"
-#include "rabit/engine.h"
+#include "../include/rabit/utils.h"
+#include "../include/rabit/engine.h"
 #include "./socket.h"

 namespace MPI {
--- a/subtree/rabit/src/allreduce_mock.h
+++ b/subtree/rabit/src/allreduce_mock.h
@ -8,8 +8,8 @@
 #ifndef RABIT_ALLREDUCE_MOCK_H
 #define RABIT_ALLREDUCE_MOCK_H
 #include <vector>
-#include <rabit/engine.h>
 #include <map>
+#include "../include/rabit/engine.h"
 #include "./allreduce_robust.h"

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

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

 namespace rabit {
--- a/subtree/rabit/src/engine.cc
+++ b/subtree/rabit/src/engine.cc
@ -10,7 +10,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 #define NOMINMAX

-#include <rabit/engine.h>
+#include "../include/rabit/engine.h"
 #include "./allreduce_base.h"
 #include "./allreduce_robust.h"

--- a/subtree/rabit/src/engine_empty.cc
+++ b/subtree/rabit/src/engine_empty.cc
@ -10,7 +10,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 #define NOMINMAX

-#include <rabit/engine.h>
+#include "../include/rabit/engine.h"

 namespace rabit {
 namespace engine {
--- a/subtree/rabit/src/engine_mpi.cc
+++ b/subtree/rabit/src/engine_mpi.cc
@ -11,8 +11,8 @@
 #define NOMINMAX
 #include <mpi.h>
 #include <cstdio>
-#include "rabit/engine.h"
-#include "rabit/utils.h"
+#include "../include/rabit/engine.h"
+#include "../include/rabit/utils.h"

 namespace rabit {
 namespace engine {
--- a/subtree/rabit/src/socket.h
+++ b/subtree/rabit/src/socket.h
@ -25,7 +25,7 @@
 #endif
 #include <string>
 #include <cstring>
-#include "rabit/utils.h"
+#include "../include/rabit/utils.h"

 #if defined(_WIN32)
 typedef int ssize_t;
--- a/subtree/rabit/wrapper/rabit_wrapper.cc
+++ b/subtree/rabit/wrapper/rabit_wrapper.cc
@ -2,9 +2,9 @@
 #define _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_DEPRECATE

-#include <rabit.h>
 #include <cstring>
 #include <string>
+#include "../include/rabit.h"
 #include "./rabit_wrapper.h"
 namespace rabit {
 namespace wrapper {