Squashed 'subtree/rabit/' changes from c7282ac..1db6449

1db6449 remove include in -I, make things easier to direct compile

git-subtree-dir: subtree/rabit
git-subtree-split: 1db6449b01

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 {

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 {

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 {

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 {

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"
 

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 {

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 {

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;